home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 16:46:06 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '76-admin-group-edit' into 'master'

Browse Source 
Fix group edit in admin area

Fixes #76

Strangly, the buttons were pushed out of the form. By including them in the fieldset of the second part of form, the layout doesn't change, but the buttons are nested within the form and are functional again.
This commit is contained in:
Dmitriy Zaporozhets
2014-03-21 10:04:04 +00:00
parent e106640ea9 d4a7036b8e
commit faa08fe6df
1 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/admin/groups/edit.html.haml
+18 -19
View File
@@ -30,26 +30,25 @@
%fieldset
%legend LDAP group settings
%div.form-holder
= form_for @group do |f|
.form-group.clearfix
= f.label :ldap_cn, class: 'control-label' do
LDAP Group cn
.col-sm-10
= f.hidden_field :ldap_cn, placeholder: "Ex. QA group", class: "xxlarge ajax-ldap-groups-select input-mn-300"
.help-block
Synchronize #{@group.name}'s members with this LDAP group.
%br
If you select an LDAP group you do not belong to you will lose ownership of #{@group.name}.
.form-group.clearfix
= f.label :ldap_cn, class: 'control-label' do
LDAP Group cn
.col-sm-10
= f.hidden_field :ldap_cn, placeholder: "Ex. QA group", class: "xxlarge ajax-ldap-groups-select input-mn-300"
.help-block
Synchronize #{@group.name}'s members with this LDAP group.
%br
If you select an LDAP group you do not belong to you will lose ownership of #{@group.name}.
.form-group.clearfix
= f.label :ldap_access, class: 'control-label' do
LDAP Access
.col-sm-10
= f.select :ldap_access, options_for_select(UsersGroup.group_access_roles, @group.ldap_access)
.help-block
Default, minimum permission level for LDAP group members of #{@group.name}.
%br
You can manage permission levels for individual group members in the Members tab.
.form-group.clearfix
= f.label :ldap_access, class: 'control-label' do
LDAP Access
.col-sm-10
= f.select :ldap_access, options_for_select(UsersGroup.group_access_roles, @group.ldap_access)
.help-block
Default, minimum permission level for LDAP group members of #{@group.name}.
%br
You can manage permission levels for individual group members in the Members tab.
.form-actions
= f.submit 'Save changes', class: "btn btn-primary"