From 2fef9c14d0d73ebd41bd3f333364addd24f3be55 Mon Sep 17 00:00:00 2001
From: Manuel Ortega <manuel@lasindias.coop>
Date: Wed, 18 Oct 2017 22:21:01 +0200
Subject: [PATCH] Moving humanized_content_type from DocumentablesHelper to
 Document model. Removing humanized_file_size in favor of direct use of
 number_to_human_size form ActionViewHelper. Added additional documentens to
 all concerned views

---
 app/helpers/documentables_helper.rb                     | 8 --------
 app/models/document.rb                                  | 4 ++++
 app/views/documents/_additional_documents.html.erb      | 4 ++--
 app/views/legislation/draft_versions/changes.html.erb   | 2 ++
 app/views/legislation/draft_versions/show.html.erb      | 2 ++
 app/views/legislation/processes/phase_empty.html.erb    | 2 ++
 app/views/legislation/processes/phase_not_open.html.erb | 2 ++
 7 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/app/helpers/documentables_helper.rb b/app/helpers/documentables_helper.rb
index 8e832535f..5c3181c95 100644
--- a/app/helpers/documentables_helper.rb
+++ b/app/helpers/documentables_helper.rb
@@ -37,12 +37,4 @@ module DocumentablesHelper
   def max_documents_allowed?(documentable)
     documentable.documents.count >= documentable.class.max_documents_allowed
   end
-
-  def documentable_humanized_content_type(documentable_class)
-    documentable_class.attachment_content_type.split("/").last.upcase
-  end
-
-  def documentable_humanized_file_size(documentable_class)
-    number_to_human_size(documentable_class.attachment_file_size)
-  end
 end
diff --git a/app/models/document.rb b/app/models/document.rb
index 8843bbed9..3771a4e69 100644
--- a/app/models/document.rb
+++ b/app/models/document.rb
@@ -52,6 +52,10 @@ class Document < ActiveRecord::Base
     end
   end
 
+  def humanized_content_type
+    attachment_content_type.split("/").last.upcase
+  end
+
   private
 
     def documentable_class
diff --git a/app/views/documents/_additional_documents.html.erb b/app/views/documents/_additional_documents.html.erb
index 9fb999de4..2c8791dad 100644
--- a/app/views/documents/_additional_documents.html.erb
+++ b/app/views/documents/_additional_documents.html.erb
@@ -8,8 +8,8 @@
           </p>
           <% documents.each do |document| %>
             <p><span class="icon-document"></span>&nbsp;
-            <%= link_to "#{document.title} <small>(#{documentable_humanized_content_type(document)} | \
-                        #{documentable_humanized_file_size(document)}</small>)".html_safe,
+            <%= link_to "#{document.title} <small>(#{document.humanized_content_type} | \
+                        #{number_to_human_size(document.attachment_file_size)}</small>)".html_safe,
                         document.attachment.url,
                         target: "_blank",
                         title: t("shared.target_blank_html") %>
diff --git a/app/views/legislation/draft_versions/changes.html.erb b/app/views/legislation/draft_versions/changes.html.erb
index dc6e0aa06..fb8ad43ad 100644
--- a/app/views/legislation/draft_versions/changes.html.erb
+++ b/app/views/legislation/draft_versions/changes.html.erb
@@ -2,6 +2,8 @@
 
 <%= render 'legislation/processes/header', process: @process, header: :small %>
 
+<%= render 'documents/additional_documents', documents: @process.documents %>
+
 <%= render 'legislation/processes/key_dates', process: @process, phase: :allegations_phase %>
 
 <div class="column row">
diff --git a/app/views/legislation/draft_versions/show.html.erb b/app/views/legislation/draft_versions/show.html.erb
index d380e5cc3..8a66d0a98 100644
--- a/app/views/legislation/draft_versions/show.html.erb
+++ b/app/views/legislation/draft_versions/show.html.erb
@@ -2,6 +2,8 @@
 
 <%= render 'legislation/processes/header', process: @process, header: :small %>
 
+<%= render 'documents/additional_documents', documents: @process.documents %>
+
 <%= render 'legislation/processes/key_dates', process: @process, phase: :allegations_phase %>
 
 <div class="column row">
diff --git a/app/views/legislation/processes/phase_empty.html.erb b/app/views/legislation/processes/phase_empty.html.erb
index 07ad9b942..1d7a28558 100644
--- a/app/views/legislation/processes/phase_empty.html.erb
+++ b/app/views/legislation/processes/phase_empty.html.erb
@@ -2,6 +2,8 @@
 
 <%= render 'legislation/processes/header', process: @process, header: :full %>
 
+<%= render 'documents/additional_documents', documents: @process.documents %>
+
 <%= render 'legislation/processes/key_dates', process: @process, phase: @phase %>
 
 <div class="debate-chooser">
diff --git a/app/views/legislation/processes/phase_not_open.html.erb b/app/views/legislation/processes/phase_not_open.html.erb
index ba78c50a8..41727e025 100644
--- a/app/views/legislation/processes/phase_not_open.html.erb
+++ b/app/views/legislation/processes/phase_not_open.html.erb
@@ -2,6 +2,8 @@
 
 <%= render 'legislation/processes/header', process: @process, header: :full %>
 
+<%= render 'documents/additional_documents', documents: @process.documents %>
+
 <%= render 'legislation/processes/key_dates', process: @process, phase: @phase %>
 
 <div class="debate-chooser">