Adapt frontend to LdapGroupLink with provider

app/assets/javascripts/api.js.coffee

@@ -2,7 +2,7 @@
   users_path: "/api/:version/users.json"
   user_path: "/api/:version/users/:id.json"
   notes_path: "/api/:version/projects/:id/notes.json"
-  ldap_groups_path: "/api/:version/ldap/groups.json"
+  ldap_groups_path: "/api/:version/ldap/:provider/groups.json"
   namespaces_path: "/api/:version/namespaces.json"
   project_users_path: "/api/:version/projects/:id/users.json"
 
@@ -89,8 +89,9 @@
     return url.replace(':version', gon.api_version)
 
   # Return LDAP groups list. Filtered by query
-  ldap_groups: (query, callback) ->
+  ldap_groups: (query, provider, callback) ->
     url = Api.buildUrl(Api.ldap_groups_path)
+    url = url.replace(':provider', provider);
 
     $.ajax(
       url: url

app/assets/javascripts/ldap_groups_select.js.coffee

@@ -12,7 +12,8 @@ $ ->
       placeholder: "Search for a LDAP group"
       minimumInputLength: 1
       query: (query) ->
-        Api.ldap_groups query.term, (groups) ->
+        provider = $('#ldap_group_link_provider').val();
+        Api.ldap_groups query.term, provider, (groups) ->
           data = { results: groups }
           query.callback(data)
 
@@ -26,3 +27,5 @@ $ ->
       dropdownCssClass: "ajax-groups-dropdown"
       formatNoMatches: (nomatch) ->
         "Match not found; try refining your search query."
+  $('#ldap_group_link_provider').on 'change', ->
+    $('.ajax-ldap-groups-select').select2('data', null)
\ No newline at end of file

app/helpers/groups_helper.rb

@@ -6,7 +6,7 @@ module GroupsHelper
   def leave_group_message(group)
     "Are you sure you want to leave \"#{group}\" group?"
   end
-  
+
   def should_user_see_group_roles?(user, group)
     if user
       user.is_admin? || group.members.exists?(user_id: user.id)

app/helpers/selects_helper.rb

@@ -18,4 +18,12 @@ module SelectsHelper
     project_id = opts[:project_id] || @project.id
     hidden_field_tag(id, value, class: css_class, 'data-placeholder' => placeholder, 'data-project-id' => project_id)
   end
+
+  def ldap_server_select_options
+    options_from_collection_for_select(
+      Gitlab::LDAP::Config.servers,
+      'provider_name',
+      'label'
+    )
+  end
 end

app/models/ldap_group_link.rb

@@ -3,7 +3,7 @@ class LdapGroupLink < ActiveRecord::Base
   belongs_to :group
 
   validates :cn, :group_access, :group_id, presence: true
-  validates :cn, uniqueness: { scope: :group_id }
+  validates :cn, uniqueness: { scope: [:group_id, :provider] }
   validates :group_access, inclusion: { in: Gitlab::Access.all_values }
 
   def access_field

app/views/ldap_group_links/_form.html.haml

@@ -7,11 +7,7 @@
           = f.label :cn, class: 'control-label' do
             LDAP Server
           .col-sm-10
-            - Gitlab::LDAP::Config.servers.each do |server|
-              .radio-inline
-                = f.radio_button :provider, server.provider_name
-                = server.label
-
+            = f.select :provider, ldap_server_select_options
         .form-group.clearfix
           = f.label :cn, class: 'control-label' do
             LDAP Group cn

spec/factories.rb

@@ -182,4 +182,10 @@ FactoryGirl.define do
     deploy_key
     project
   end
+
+  factory :ldap_group_link do
+    cn 'group1'
+    group_access Gitlab::Access::GUEST
+    provider 'ldapmain'
+  end
 end

spec/models/ldap_group_link_spec.rb

+require 'spec_helper'
+
+describe LdapGroupLink do
+  let(:klass) { LdapGroupLink }
+  let(:ldap_group_link) { build :ldap_group_link }
+
+  describe "validation" do
+    describe "cn" do
+      it "validates uniquiness based on group_id and provider" do
+        create(:ldap_group_link, cn: 'group1', group_id: 1, provider: 'ldapmain')
+
+        group_link = build(:ldap_group_link,
+          cn: 'group1', group_id: 1, provider: 'ldapmain')
+        expect(group_link).to_not be_valid
+
+        group_link.group_id = 2
+        expect(group_link).to be_valid
+
+        group_link.group_id = 1
+        group_link.provider = 'ldapalt'
+        expect(group_link).to be_valid
+      end
+    end
+
+    describe :provider do
+      it "shows the set value" do
+        ldap_group_link.provider = '1235'
+        expect( ldap_group_link.provider ).to eql '1235'
+      end
+
+      it "defaults to the first ldap server if empty" do
+        expect( klass.new.provider ).to eql Gitlab::LDAP::Config.providers.first
+      end
+    end
+  end
+end
\ No newline at end of file