Fix adding new Ldap links

parent 7efb958c
...@@ -52,22 +52,27 @@ ...@@ -52,22 +52,27 @@
%li It will change web url for access group and group projects. %li It will change web url for access group and group projects.
%li It will change the git path to repositories under this group. %li It will change the git path to repositories under this group.
%section.ldap-group-links .form-actions
%fieldset = f.submit 'Save changes', class: "btn btn-primary"
%legend Current LDAP links = link_to 'Cancel', admin_group_path(@group), class: "btn btn-cancel"
- if @group.ldap_group_links.any?
%ul.bordered-list
- @group.ldap_group_links.each do |ldap_group_link|
%li
%h4
= ldap_group_link.cn
%small.light== as #{ldap_group_link.human_access}
.pull-right
= link_to group_ldap_group_link_path(@group, ldap_group_link), method: :destroy, class: 'btn btn-danger btn-small' do
= fa_icon('unlink', text: 'unlink')
- else
%p No links yet
- if @group.persisted?
%section.ldap-group-links
%fieldset
%legend Current LDAP links
- if @group.ldap_group_links.any?
%ul.bordered-list
- @group.ldap_group_links.each do |ldap_group_link|
%li
%h4
= ldap_group_link.cn
%small.light== as #{ldap_group_link.human_access}
.pull-right
= link_to group_ldap_group_link_path(@group, ldap_group_link), method: :delete, class: 'btn btn-danger btn-small' do
= fa_icon('unlink', text: 'unlink')
- else
%p No links yet
= form_for [@group, @group.ldap_group_links.new] do |f|
%fieldset %fieldset
%legend Add new LDAP link %legend Add new LDAP link
%div.form-holder %div.form-holder
...@@ -75,23 +80,23 @@ ...@@ -75,23 +80,23 @@
= f.label :ldap_cn, class: 'control-label' do = f.label :ldap_cn, class: 'control-label' do
LDAP Group cn LDAP Group cn
.col-sm-10 .col-sm-10
= f.hidden_field :ldap_cn, placeholder: "Ex. QA group", class: "xxlarge ajax-ldap-groups-select input-mn-300" = f.hidden_field :cn, placeholder: "Ex. QA group", class: "xxlarge ajax-ldap-groups-select input-mn-300"
.help-block .help-block
Synchronize #{@group.name}'s members with this LDAP group. Synchronize #{@group.name}'s members with this LDAP group.
%br %br
If you select an LDAP group you do not belong to you will lose ownership of #{@group.name}. If you select an LDAP group you do not belong to you will lose ownership of #{@group.name}.
.form-group.clearfix .form-group.clearfix
= f.label :ldap_access, class: 'control-label' do = f.label :group_access, class: 'control-label' do
LDAP Access LDAP Access
.col-sm-10 .col-sm-10
= f.select :ldap_access, options_for_select(UsersGroup.group_access_roles, @group.ldap_access) = f.select :group_access, options_for_select(UsersGroup.group_access_roles)
.help-block .help-block
Default, minimum permission level for LDAP group members of #{@group.name}. Default, minimum permission level for LDAP group members of #{@group.name}.
%br %br
You can manage permission levels for individual group members in the Members tab. You can manage permission levels for individual group members in the Members tab.
.form-actions .form-actions
= f.submit 'Save changes', class: "btn btn-primary" = f.submit 'Save changes', class: "btn btn-primary"
= link_to 'Cancel', admin_group_path(@group), class: "btn btn-cancel" = link_to 'Cancel', admin_group_path(@group), class: "btn btn-cancel"
...@@ -166,8 +166,8 @@ Gitlab::Application.routes.draw do ...@@ -166,8 +166,8 @@ Gitlab::Application.routes.draw do
end end
resources :users_groups, only: [:create, :update, :destroy] resources :users_groups, only: [:create, :update, :destroy]
resources :ldap_group_links, only: [:create, :destroy]
scope module: :groups do scope module: :groups do
resources :ldap_group_links, only: [:create, :destroy]
resource :avatar, only: [:destroy] resource :avatar, only: [:destroy]
resources :milestones resources :milestones
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment