From 6b436efafc72b5d85fb9d2f3b7a46157df223880 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= <jjbazan@gmail.com>
Date: Mon, 14 Sep 2015 17:24:34 +0200
Subject: [PATCH] adds cache to proposal's show

---
 app/views/proposals/show.html.erb | 149 +++++++++++++++---------------
 1 file changed, 75 insertions(+), 74 deletions(-)

diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb
index b4e40deba..a98ca1d69 100644
--- a/app/views/proposals/show.html.erb
+++ b/app/views/proposals/show.html.erb
@@ -1,90 +1,91 @@
-<section class="proposal-show">
-  <div id="<%= dom_id(@proposal) %>" class="row">
-    <div class="small-12 medium-9 column">
-      <i class="icon-angle-left left"></i>&nbsp;
-      <%= link_to t("proposals.show.back_link"), proposals_path, class: 'left back' %>
+<% cache [locale_and_user_status(@proposal), @proposal, @proposal.author, Flag.flagged?(current_user, @proposal), @proposal_votes] do %>
+  <section class="proposal-show">
+    <div id="<%= dom_id(@proposal) %>" class="row">
+      <div class="small-12 medium-9 column">
+        <i class="icon-angle-left left"></i>&nbsp;
+        <%= link_to t("proposals.show.back_link"), proposals_path, class: 'left back' %>
 
-      <% if current_user && @proposal.editable_by?(current_user) %>
-        <%= link_to edit_proposal_path(@proposal), class: 'edit-proposal button success tiny radius right' do %>
-          <i class="icon-edit"></i>
-          <%= t("proposals.show.edit_proposal_link") %>
-        <% end %>
-      <% end %>
-
-      <h1><%= @proposal.title %></h1>
-      <% if @proposal.conflictive? %>
-        <div class="alert-box alert radius margin-top">
-          <strong><%= t("proposals.show.flag") %></strong>
-        </div>
-      <% end %>
-
-
-      <div class="proposal-info">
-        <%= avatar_image(@proposal.author, seed: @proposal.author_id, size: 32, class: 'author-photo') %>
-
-        <% if @proposal.author.hidden? %>
-          <i class="icon-deleted author-deleted"></i>
-          <span class="author">
-              <%= t("proposals.show.author_deleted") %>
-          </span>
-        <% else %>
-          <span class="author">
-              <%= @proposal.author.name %>
-          </span>
-          <% if @proposal.author.official? %>
-            &nbsp;&bull;&nbsp;
-            <span class="label round level-<%= @proposal.author.official_level %>">
-              <%= @proposal.author.official_position %>
-            </span>
+        <% if current_user && @proposal.editable_by?(current_user) %>
+          <%= link_to edit_proposal_path(@proposal), class: 'edit-proposal button success tiny radius right' do %>
+            <i class="icon-edit"></i>
+            <%= t("proposals.show.edit_proposal_link") %>
           <% end %>
         <% end %>
 
-        <% if @proposal.author.verified_organization? %>
-          &nbsp;&bull;&nbsp;
-          <span class="label round is-association">
-            <%= t("shared.collective") %>
-          </span>
+        <h1><%= @proposal.title %></h1>
+        <% if @proposal.conflictive? %>
+          <div class="alert-box alert radius margin-top">
+            <strong><%= t("proposals.show.flag") %></strong>
+          </div>
         <% end %>
 
-        <span class="bullet">&nbsp;&bull;&nbsp;</span>
-        <%= l @proposal.created_at.to_date %>
-        <span class="bullet">&nbsp;&bull;&nbsp;</span>
-        <i class="icon-comments"></i>&nbsp;
-        <%= link_to t("proposals.show.comments", count: @proposal.comments_count), "#comments" %>
-        <span class="bullet">&nbsp;&bull;&nbsp;</span>
-        <span class="js-flag-actions">
-          <%= render 'proposals/flag_actions', proposal: @proposal %>
-        </span>
-      </div>
 
-      <%= safe_html_with_links @proposal.description %>
+        <div class="proposal-info">
+          <%= avatar_image(@proposal.author, seed: @proposal.author_id, size: 32, class: 'author-photo') %>
 
-      <% if @proposal.external_url.present? %>
-        <div><%= link_to(@proposal.external_url) %></div>
-      <% end %>
+          <% if @proposal.author.hidden? %>
+            <i class="icon-deleted author-deleted"></i>
+            <span class="author">
+                <%= t("proposals.show.author_deleted") %>
+            </span>
+          <% else %>
+            <span class="author">
+                <%= @proposal.author.name %>
+            </span>
+            <% if @proposal.author.official? %>
+              &nbsp;&bull;&nbsp;
+              <span class="label round level-<%= @proposal.author.official_level %>">
+                <%= @proposal.author.official_position %>
+              </span>
+            <% end %>
+          <% end %>
 
-      <h4><%= @proposal.question %></h4>
+          <% if @proposal.author.verified_organization? %>
+            &nbsp;&bull;&nbsp;
+            <span class="label round is-association">
+              <%= t("shared.collective") %>
+            </span>
+          <% end %>
 
-      <%= render 'shared/tags', proposal: @proposal %>
+          <span class="bullet">&nbsp;&bull;&nbsp;</span>
+          <%= l @proposal.created_at.to_date %>
+          <span class="bullet">&nbsp;&bull;&nbsp;</span>
+          <i class="icon-comments"></i>&nbsp;
+          <%= link_to t("proposals.show.comments", count: @proposal.comments_count), "#comments" %>
+          <span class="bullet">&nbsp;&bull;&nbsp;</span>
+          <span class="js-flag-actions">
+            <%= render 'proposals/flag_actions', proposal: @proposal %>
+          </span>
+        </div>
 
-      <div class='js-moderator-proposal-actions'>
-        <%= render 'actions', proposal: @proposal %>
-      </div>
-    </div>
+        <%= safe_html_with_links @proposal.description %>
 
-    <aside class="small-12 medium-3 column">
-      <div class="sidebar-divider"></div>
-      <h3><%= t("votes.supports") %></h3>
-      <div class="text-center">
-        <div id="<%= dom_id(@proposal) %>_votes">
-         <%= render 'proposals/votes', proposal: @proposal %>
+        <% if @proposal.external_url.present? %>
+          <div><%= link_to(@proposal.external_url) %></div>
+        <% end %>
+
+        <h4><%= @proposal.question %></h4>
+
+        <%= render 'shared/tags', proposal: @proposal %>
+
+        <div class='js-moderator-proposal-actions'>
+          <%= render 'actions', proposal: @proposal %>
         </div>
       </div>
-      <div class="sidebar-divider"></div>
-      <h3><%= t("proposals.show.share") %></h3>
-      <%= social_share_button_tag(@proposal.title) %>
-    </aside>
-  </div>
-</section>
 
+      <aside class="small-12 medium-3 column">
+        <div class="sidebar-divider"></div>
+        <h3><%= t("votes.supports") %></h3>
+        <div class="text-center">
+          <div id="<%= dom_id(@proposal) %>_votes">
+           <%= render 'proposals/votes', proposal: @proposal %>
+          </div>
+        </div>
+        <div class="sidebar-divider"></div>
+        <h3><%= t("proposals.show.share") %></h3>
+        <%= social_share_button_tag(@proposal.title) %>
+      </aside>
+    </div>
+  </section>
+<% end %>
 <%= render "comments" %>