Merge pull request #849 from amatsuda/inline_options_helpers

Inline some helpers in decorators

Author: amatsuda

app/decorators/proposal_decorator.rb

@@ -89,48 +89,6 @@ def bio
     speaker ? speaker.bio : ''
   end
 
-  def pitch_markdown
-    h.markdown(object.pitch)
-  end
-
-  def details_markdown
-    h.markdown(object.details)
-  end
-
-  def abstract_markdown
-    h.markdown(object.abstract)
-  end
-
-  def withdraw_button
-    h.link_to h.bang('Withdraw Proposal'),
-      h.withdraw_event_proposal_path(uuid: object, event_slug: object.event.slug),
-      data: {
-        turbo: true,
-        turbo_method: :post,
-        turbo_confirm: 'This will remove your talk from consideration and send an email to the event coordinator. Are you sure you want to do this?'
-      },
-      class: 'btn btn-warning',
-      id: 'withdraw'
-  end
-
-  def confirm_button
-    h.link_to 'Confirm',
-              h.confirm_event_proposal_path(uuid: object, event_slug: object.event.slug),
-              data: {turbo: true, turbo_method: :post},
-              class: 'btn btn-success'
-  end
-
-  def decline_button
-    h.link_to h.bang('Decline'),
-              h.decline_event_proposal_path(uuid: object, event_slug: object.event.slug),
-              data: {
-                turbo: true,
-                turbo_method: :post,
-                turbo_confirm: 'This will remove your talk from consideration and notify the event staff. Are you sure you want to do this?'
-              },
-              class: 'btn btn-warning'
-  end
-
   def confirm_link
     h.link_to 'confirmation page',
       h.event_proposal_url(object.event, object, protocol: 'https')
@@ -155,25 +113,6 @@ def created_in_words
     "#{h.time_ago_in_words(object.created_at)} ago"
   end
 
-  def title_input(form)
-    form.input :title,
-    autofocus: true,
-    maxlength: :lookup, input_html: { class: 'watched js-maxlength-alert' },
-    hint: "Publicly viewable title. Ideally catchy, interesting, essence of the talk. Limited to 60 characters."
-  end
-
-  def speaker_input(form)
-    form.input :speaker
-  end
-
-  def track_options
-    @track_options ||= object.event.tracks.map { |t| [t.name, t.id] }.sort
-  end
-
-  def format_options
-    @format_options ||= object.event.session_formats.map { |sf| [sf.name, sf.id] }.sort
-  end
-
   def invitations_enabled?(user)
     object.has_speaker?(user) && !object.finalized?
   end

app/views/proposals/_contents.html.haml

@@ -1,19 +1,19 @@
 .proposal-section
   %h3.control-label Abstract
   .markdown{ data: { 'field-name' => 'proposal[abstract]' } }
-    = proposal.abstract_markdown
+    = markdown proposal.abstract
 
 %h2.fieldset-legend For Review Committee
 
 .proposal-section
   %h3.control-label Details
   .markdown{ data: { 'field-name' => 'proposal[details]' } }
-    = proposal.details_markdown
+    = markdown proposal.details
 
 .proposal-section
   %h3.control-label Pitch
   .markdown{ data: { 'field-name' => 'proposal[pitch]' } }
-    =proposal.pitch_markdown
+    = markdown proposal.pitch
 
 - if proposal.custom_fields.any?
   - proposal.proposal_data[:custom_fields].select do |key,value|

app/views/proposals/_form.html.haml

@@ -1,5 +1,5 @@
 %fieldset.margin-top
-  = proposal.title_input(f)
+  = f.input :title, autofocus: true, maxlength: :lookup, input_html: {class: 'watched js-maxlength-alert'}, hint: 'Publicly viewable title. Ideally catchy, interesting, essence of the talk. Limited to 60 characters.'
 
   - opts_session_formats = event.session_formats.publicly_viewable.map {|st| [st.name, st.id]}
   - if !proposal.has_reviewer_activity?

app/views/proposals/show.html.haml

@@ -6,7 +6,7 @@
           %span.bi.bi-pencil
           Edit
       - if proposal.speaker_can_withdraw?(current_user)
-        = proposal.withdraw_button
+        = link_to bang('Withdraw Proposal'), withdraw_event_proposal_path(event, uuid: proposal), data: {turbo: true, turbo_method: :post, turbo_confirm: 'This will remove your talk from consideration and send an email to the event coordinator. Are you sure you want to do this?'}, class: 'btn btn-warning', id: 'withdraw'
       - if proposal.speaker_can_delete?(current_user)
         = link_to event_proposal_path(event, uuid: proposal), data: {turbo: true, turbo_method: :delete, turbo_confirm: 'This will delete your talk. Are you sure you want to do this? It can not be undone.'}, class: 'btn btn-warning', id: 'delete' do
           %span.bi.bi-exclamation-circle
@@ -94,8 +94,8 @@
           .widget-header
             %h2 Confirm participation in #{proposal.event.name}
           .widget-content
-            = proposal.confirm_button
-            = proposal.decline_button
+            = link_to 'Confirm', confirm_event_proposal_path(event, uuid: proposal), data: {turbo: true, turbo_method: :post}, class: 'btn btn-success'
+            = link_to bang('Decline'), decline_event_proposal_path(event, uuid: proposal), data: {turbo: true, turbo_method: :post, turbo_confirm: 'This will remove your talk from consideration and notify the event staff. Are you sure you want to do this?'}, class: 'btn btn-warning'
       - elsif proposal.confirmed?
         .widget.widget-card
           .widget-content

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

@@ -2,7 +2,7 @@
     = f.input :format,
       required: false,
       label_html: {class: 'info-item-heading'},
-      collection: proposal.format_options,
+      collection: proposal.event.session_formats.map { |sf| [sf.name, sf.id] }.sort,
       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'}},

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

@@ -3,7 +3,7 @@
     = f.input :track,
       required: false,
       label_html: {class: 'info-item-heading'},
-      collection: proposal.track_options,
+      collection: proposal.event.tracks.map { |t| [t.name, t.id] }.sort,
       include_blank: Track::NO_TRACK,
       selected: proposal.track_id,
       id: 'track',

app/views/staff/proposal_reviews/_reviewer_contents.html.haml

@@ -1,7 +1,7 @@
 .proposal-section
   %h3.control-label Abstract
   .markdown{ data: { 'field-id' => 'proposal_abstract' } }
-    = proposal.abstract_markdown
+    = markdown proposal.abstract
 
 %h2.fieldset-legend For Review Committee