Merge pull request #848 from amatsuda/inline_select_helpers

Inlining two standalone_*_select helpers that are used only once in the views

Author: amatsuda

app/decorators/proposal_decorator.rb

@@ -166,47 +166,6 @@ def speaker_input(form)
     form.input :speaker
   end
 
-  def standalone_track_select(tooltip)
-    h.simple_form_for :proposal, html: {data: {controller: 'proposal-select'}} do |f|
-      f.input :track,
-        required: false,
-        label_html: { class: 'info-item-heading' },
-        collection: track_options,
-        include_blank: Track::NO_TRACK,
-        selected: object.track_id,
-        id: 'track',
-        input_html: {
-          class: 'proposal-track-select form-control select',
-          data: {
-            target_path: h.event_staff_program_proposal_update_track_path(object.event, object),
-            select_type: 'track',
-            action: 'change->proposal-select#change'
-          },
-        },
-        popover_icon: { content: tooltip }
-    end
-  end
-
-  def standalone_format_select(tooltip)
-    h.simple_form_for :proposal, html: {data: {controller: 'proposal-select'}} do |f|
-      f.input :format,
-        required: false,
-        label_html: { class: 'info-item-heading' },
-        collection: format_options,
-        selected: object.session_format_id,
-        id: 'track',
-        input_html: {
-          class: 'proposal-format-select form-control select',
-          data: {
-            target_path: h.event_staff_program_proposal_update_session_format_path(object.event, object),
-            select_type: 'format',
-            action: 'change->proposal-select#change'
-          },
-        },
-        popover_icon: { content: tooltip }
-    end
-  end
-
   def track_options
     @track_options ||= object.event.tracks.map { |t| [t.name, t.id] }.sort
   end
@@ -247,5 +206,4 @@ def state_class(state)
       'label-default'
     end
   end
-
 end

app/views/shared/proposals/_inline_format_edit.html.haml

@@ -1 +1,9 @@
-= proposal.standalone_format_select(session_format_tooltip)
+= simple_form_for :proposal, html: {data: {controller: 'proposal-select'}} do |f|
+    = f.input :format,
+      required: false,
+      label_html: {class: 'info-item-heading'},
+      collection: proposal.format_options,
+      selected: proposal.session_format_id,
+      id: 'track',
+      input_html: {class: 'proposal-format-select form-control select', data: {target_path: event_staff_program_proposal_update_session_format_path(proposal.event, proposal), select_type: 'format', action: 'change->proposal-select#change'}},
+      popover_icon: {content: session_format_tooltip}

app/views/shared/proposals/_inline_track_edit.html.haml

@@ -1,4 +1,13 @@
 - if proposal.event.multiple_tracks?
-  = proposal.standalone_track_select(track_tooltip)
+  = simple_form_for :proposal, html: {data: {controller: 'proposal-select'}} do |f|
+    = f.input :track,
+      required: false,
+      label_html: {class: 'info-item-heading'},
+      collection: proposal.track_options,
+      include_blank: Track::NO_TRACK,
+      selected: proposal.track_id,
+      id: 'track',
+      popover_icon: {content: track_tooltip},
+      input_html: {class: 'proposal-track-select form-control select', data: {target_path: event_staff_program_proposal_update_track_path(proposal.event, proposal), select_type: 'track', action: 'change->proposal-select#change'}}
 - else
   = proposal.track_name