home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 05:36:07 +10:00
Code Issues Packages Projects Releases Wiki Activity

Disable ldap user showing only if group is synced with LDAP group.

Browse Source
This commit is contained in:
Marin Jankovski
2014-10-01 14:59:37 +02:00
parent 44b94f7c26
commit 336b7b8783
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/admin/groups/show.html.haml
+1 -1
View File
@@ -87,7 +87,7 @@
= form_tag project_teams_update_admin_group_path(@group), id: "new_team_member", class: "bulk_import", method: :put do
%div
= users_select_tag(:user_ids, { multiple: true, skip_ldap: true })
= users_select_tag(:user_ids, { multiple: true, skip_ldap: @group.ldap_cn.present? })
%div.prepend-top-10
= select_tag :group_access, options_for_select(UsersGroup.group_access_roles), class: "project-access-select select2"
%hr
app/views/groups/_new_group_member.html.haml
+1 -1
View File
@@ -1,7 +1,7 @@
= form_for @users_group, url: group_users_groups_path(@group), html: { class: 'form-horizontal users-group-form' } do |f|
.form-group
= f.label :user_ids, "People", class: 'control-label'
.col-sm-10= users_select_tag(:user_ids, { multiple: true, skip_ldap: true , class: 'input-large' })
.col-sm-10= users_select_tag(:user_ids, { multiple: true, skip_ldap: @group.ldap_cn.present? , class: 'input-large' })
.form-group
= f.label :group_access, "Group Access", class: 'control-label'
app/views/projects/team_members/_form.html.haml
+1 -1
View File
@@ -12,7 +12,7 @@
.form-group
= f.label :user_ids, "People", class: 'control-label'
.col-sm-10
= users_select_tag(:user_ids, { multiple: true, skip_ldap: true })
= users_select_tag(:user_ids, { multiple: true, skip_ldap: @project.group.ldap_cn.present? })
%p 2. Set access level for them
.form-group