From 51cd2d451ae816c4b0dc36d7bf5d5dc919f7018d Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 24 Oct 2015 05:51:14 +0000
Subject: Thumbnails in issue history (#13429).

git-svn-id: http://svn.redmine.org/redmine/trunk@14731 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/journals_helper.rb     | 7 +++++++
 app/views/issues/_history.html.erb | 7 +++++++
 2 files changed, 14 insertions(+)

(limited to 'app')

diff --git a/app/helpers/journals_helper.rb b/app/helpers/journals_helper.rb
index dfe729506..d6d6ec4e9 100644
--- a/app/helpers/journals_helper.rb
+++ b/app/helpers/journals_helper.rb
@@ -18,6 +18,13 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 module JournalsHelper
+
+  # Returns the attachments of a journal that are displayed as thumbnails
+  def journal_thumbnail_attachments(journal)
+    ids = journal.details.select {|d| d.property == 'attachment' && d.value.present?}.map(&:prop_key)
+    ids.any? ? Attachment.where(:id => ids).select(&:thumbnailable?) : []
+  end
+
   def render_notes(issue, journal, options={})
     content = ''
     editable = User.current.logged? && (User.current.allowed_to?(:edit_issue_notes, issue.project) || (journal.user == User.current && User.current.allowed_to?(:edit_own_issue_notes, issue.project)))
diff --git a/app/views/issues/_history.html.erb b/app/views/issues/_history.html.erb
index fc4593ab8..993dfee3c 100644
--- a/app/views/issues/_history.html.erb
+++ b/app/views/issues/_history.html.erb
@@ -13,6 +13,13 @@
        <li><%= string %></li>
       <% end %>
     </ul>
+    <% if Setting.thumbnails_enabled? && (thumbnail_attachments = journal_thumbnail_attachments(journal)).any? %>
+      <div class="thumbnails">
+        <% thumbnail_attachments.each do |attachment| %>
+          <div><%= thumbnail_tag(attachment) %></div>
+        <% end %>
+      </div>
+    <% end %>
     <% end %>
     <%= render_notes(issue, journal, :reply_links => reply_links) unless journal.notes.blank? %>
     </div>
-- 
cgit v1.2.3