Merge branch 'hotfix/0.3_fix'

* hotfix/0.3_fix: #211 fix removing participants
ulmic · Jul 13, 2015 · 470df43 · 470df43
2 parents 54a9fd7 + 7712445
commit 470df43
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/app/assets/stylesheets/web/admin/events.css.sass b/app/assets/stylesheets/web/admin/events.css.sass
@@ -17,5 +17,6 @@ form
           width: 20%
           text-align: right
           padding-right: 5px
+          font-size: 14px
       a.remove-registration
         float: right
diff --git a/app/views/web/admin/events/_form.html.haml b/app/views/web/admin/events/_form.html.haml
@@ -51,11 +51,11 @@
       .registrations
         %h3
           = t('.registrations')
-        .registration_fields
           = f.simple_fields_for :registrations do |reg_form|
-            = reg_form.input :user_id, as: :select, collection: members_hash(@members), input_html: { class: :select2 }
-            = reg_form.input :role, as: :select, collection: enumerize_locales_hash(Event::Registration, :role)
-            = link_to_remove_association 'X', reg_form, class: 'btn btn-danger remove-registration', data: { 'wrapper-class' => 'registration_fields' }
+            .registration_fields
+              = reg_form.input :user_id, as: :select, collection: members_hash(@members), input_html: { class: :select2 }
+              = reg_form.input :role, as: :select, collection: enumerize_locales_hash(Event::Registration, :role)
+              = link_to_remove_association 'X', reg_form, class: 'btn btn-danger remove-registration', data: { 'wrapper-class' => 'registration_fields' }
         = link_to_add_association t('.add_registration'), f, :registrations, data: { 'association-insertion-node' => 'this' }, class: 'btn btn-warning add_fields'
       = f.button :submit, t('helpers.links.save'), class: 'btn-success'
       = link_to t('helpers.links.back'), events_path, class: 'btn btn-default'