Add method to follows helper to get followable partial name and argum…

…ents automatically.
consuldemocracy · Jul 18, 2017 · 57c8887 · 57c8887
1 parent 16987e7
commit 57c8887
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/app/helpers/follows_helper.rb b/app/helpers/follows_helper.rb
@@ -62,6 +62,10 @@ def entity_icon(entity)
  }.invert[entity]
  end
 
+ def entity_partial(class_name)
+ class_name.parameterize.gsub('-','_')
+ end
+
  private
 
  def followed?(followable)

diff --git a/app/views/users/_following.html.erb b/app/views/users/_following.html.erb
@@ -17,11 +17,8 @@
  <table>
  <tbody>
  <% @follows.where(followable_type: followable_type).each do |follow| %>
- <% if followable_type == "Proposal" %>
- <%= render "proposal", proposal: follow.followable %>
- <% elsif followable_type == "Budget::Investment" %>
- <%= render "budget_investment", budget_investment: follow.followable %>
- <% end %>
+ <%= render entity_partial(followable_type),
+ entity_partial(followable_type).to_sym => follow.followable %>
  <% end %>
  </tbody>
  </table>

diff --git a/app/views/users/_proposal.html.erb b/app/views/users/_proposal.html.erb
@@ -7,14 +7,18 @@
 
  <% if proposal.retired? %>
 
+ <td class="text-center">
+ <span class="label alert"><%= t('users.proposals.retired') %></span>
+ </td>
+
+ <% elsif author?(proposal) %>
+
  <td class="text-center">
  <%= link_to t("users.proposals.send_notification"),
  new_proposal_notification_path(proposal_id: proposal.id),
  class: 'button hollow' %>
  </td>
 
- <% elsif author?(proposal) %>
-
  <td class="text-center">
  <% if proposal.retired? %>
  <span class="label alert"><%= t('users.proposals.retired') %></span>