From 123d7dc0e21841a459520be7d0f2ab427f2585e2 Mon Sep 17 00:00:00 2001 From: Job van der Voort Date: Thu, 20 Mar 2014 14:58:27 +0100 Subject: [PATCH 1/2] add submit to fieldset so form is submittable --- app/views/admin/groups/edit.html.haml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/admin/groups/edit.html.haml b/app/views/admin/groups/edit.html.haml index 2272055ed7..1a930a57be 100644 --- a/app/views/admin/groups/edit.html.haml +++ b/app/views/admin/groups/edit.html.haml @@ -51,6 +51,6 @@ %br You can manage permission levels for individual group members in the Members tab. - .form-actions - = f.submit 'Save changes', class: "btn btn-primary" - = link_to 'Cancel', admin_groups_path, class: "btn btn-cancel" + .form-actions + = f.submit 'Save changes', class: "btn btn-primary" + = link_to 'Cancel', admin_groups_path, class: "btn btn-cancel" From d4a7036b8ee2dd3aaca128704d98383b341bac7e Mon Sep 17 00:00:00 2001 From: Job van der Voort Date: Fri, 21 Mar 2014 08:26:39 +0100 Subject: [PATCH 2/2] remove useless nested form from admin group edit form --- app/views/admin/groups/edit.html.haml | 43 +++++++++++++-------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/app/views/admin/groups/edit.html.haml b/app/views/admin/groups/edit.html.haml index 1a930a57be..1aac0da981 100644 --- a/app/views/admin/groups/edit.html.haml +++ b/app/views/admin/groups/edit.html.haml @@ -30,27 +30,26 @@ %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" - = link_to 'Cancel', admin_groups_path, class: "btn btn-cancel" + .form-actions + = f.submit 'Save changes', class: "btn btn-primary" + = link_to 'Cancel', admin_groups_path, class: "btn btn-cancel"