Merge pull request #240 from fnf-org/232-role-as-event-option

232 role as event option

.version

@@ -1 +1 @@
-1.2.1
+1.2.2

app/views/ticket_requests/_event_role.html.haml

@@ -5,25 +5,25 @@
       .input-group-large
         %fieldset
           %p
-            = f.label :role_volunteer do
-              = f.label :role_volunteer, class: 'radio inline' do
-                = f.radio_button :role, TicketRequest::ROLE_VOLUNTEER,
+            = form.label :role_volunteer do
+              = form.label :role_volunteer, class: 'radio inline' do
+                = form.radio_button :role, TicketRequest::ROLE_VOLUNTEER,
                               data: { 'max-tickets' => TicketRequest::TICKET_LIMITS[TicketRequest::ROLE_VOLUNTEER] }
                 = TicketRequest::ROLES[TicketRequest::ROLE_VOLUNTEER]
-              = f.label :role_contributor, class: 'radio inline' do
-                = f.radio_button :role, TicketRequest::ROLE_CONTRIBUTOR,
+              = form.label :role_contributor, class: 'radio inline' do
+                = form.radio_button :role, TicketRequest::ROLE_CONTRIBUTOR,
                               data: { 'max-tickets' => TicketRequest::TICKET_LIMITS[TicketRequest::ROLE_CONTRIBUTOR] }
                 = TicketRequest::ROLES[TicketRequest::ROLE_CONTRIBUTOR]
-              = f.label :role_coordinator, class: 'radio inline' do
-                = f.radio_button :role, TicketRequest::ROLE_COORDINATOR,
+              = form.label :role_coordinator, class: 'radio inline' do
+                = form.radio_button :role, TicketRequest::ROLE_COORDINATOR,
                               data: { 'max-tickets' => TicketRequest::TICKET_LIMITS[TicketRequest::ROLE_COORDINATOR] }
                 = TicketRequest::ROLES[TicketRequest::ROLE_COORDINATOR]
-              = f.label :role_uber_coordinator, class: 'radio inline' do
-                = f.radio_button :role, TicketRequest::ROLE_UBER_COORDINATOR,
+              = form.label :role_uber_coordinator, class: 'radio inline' do
+                = form.radio_button :role, TicketRequest::ROLE_UBER_COORDINATOR,
                               data: { 'max-tickets' => TicketRequest::TICKET_LIMITS[TicketRequest::ROLE_UBER_COORDINATOR] }
                 = TicketRequest::ROLES[TicketRequest::ROLE_UBER_COORDINATOR]
-              = f.label :role_other, class: 'radio inline' do
-                = f.radio_button :role, TicketRequest::ROLE_OTHER,
+              = form.label :role_other, class: 'radio inline' do
+                = form.radio_button :role, TicketRequest::ROLE_OTHER,
                               data: { 'max-tickets' => TicketRequest::TICKET_LIMITS[TicketRequest::ROLE_OTHER] }
                 = TicketRequest::ROLES[TicketRequest::ROLE_OTHER]
 
@@ -45,13 +45,13 @@
       %p.muted.role-explanation.hidden{ class: TicketRequest::ROLE_OTHER }
         Art Grantee or DJ
 
-      = f.text_area :role_explanation,
+      = form.text_area :role_explanation,
                     placeholder: 'Briefly describe your role',
                     rows: 4, width: 400, maxlength: 200, required: false, style: 'min-width: 100% !important; font-size: 11pt;'
 
 .row
   .col-lg-6.col-xl-6.col-md-12.col-sm-12
     - if @event.require_role
-      = f.label :previous_contribution, 'What was your role last year?'
-      = f.text_area :previous_contribution, style: 'min-width: 100%',
+      = form.label :previous_contribution, 'What was your role last year?'
+      = form.text_area :previous_contribution, style: 'min-width: 100%',
                       rows: 2, maxlength: 250, required: false

app/views/ticket_requests/_form.html.haml

@@ -88,7 +88,7 @@
             - if !@ticket_request.post_payment? || (@event.admin?(current_user) && is_update)
               %hr
               - if @event.require_role
-                = render partial: :event_role
+                = render partial: 'event_role', locals: { form: f }
 
               - if signed_in? && @event.admin?(current_user) && is_update
                 .well