From 852dc2eb7ef63fbdb799c37d0d284c3d71127ba9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Zrim=C5=A1ek?= <mzrimsek@biosistemika.com>
Date: Wed, 11 Jan 2017 14:13:48 +0100
Subject: [PATCH 1/2] Added file downloading to protocol preview in protocol
 repository. [SCI-878]

---
 .../index/_protocol_preview_modal_body.html.erb   | 15 +++++++++++----
 app/views/steps/_step.html.erb                    |  1 +
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/views/protocols/index/_protocol_preview_modal_body.html.erb b/app/views/protocols/index/_protocol_preview_modal_body.html.erb
index ea4530bf9..1a927de67 100644
--- a/app/views/protocols/index/_protocol_preview_modal_body.html.erb
+++ b/app/views/protocols/index/_protocol_preview_modal_body.html.erb
@@ -112,9 +112,17 @@
                     <ul class="list-unstyled">
                       <% assets.each do |asset| %>
                         <li>
-                          <%= image_tag preview_asset_path(asset) if asset.is_image? %>
-                          <p><%= truncate(asset.file_file_name,
-                                          length: Constants::FILENAME_TRUNCATION_LENGTH) %></p>
+                          <% if can_view_or_download_step_assets(@protocol) %>
+                            <%= link_to download_asset_path(asset), data: {no_turbolink: true, id: true, status: "asset-present"} do %>
+                              <%= image_tag preview_asset_path(asset) if asset.is_image? %>
+                              <p><%= truncate(asset.file_file_name,
+                                              length: Constants::FILENAME_TRUNCATION_LENGTH) %></p>
+                            <% end %>
+                          <% else %>
+                            <%= image_tag preview_asset_path(asset) if asset.is_image? %>
+                            <p><%= truncate(asset.file_file_name,
+                                            length: Constants::FILENAME_TRUNCATION_LENGTH) %></p>
+                          <% end %>
                         </li>
                       <% end %>
                     </ul>
@@ -122,7 +130,6 @@
                 <% end %>
 
                 <% unless step.checklists.blank? then %>
-                  <hr>
                   <div class="col-xs-12">
                     <% step.checklists.each do |checklist| %>
                       <strong><%= checklist.name %></strong>
diff --git a/app/views/steps/_step.html.erb b/app/views/steps/_step.html.erb
index 7bf224a51..29d36ee8c 100644
--- a/app/views/steps/_step.html.erb
+++ b/app/views/steps/_step.html.erb
@@ -57,6 +57,7 @@
                 <% end %>
             </div>
           <% end %>
+
           <% assets = ordered_assets(step) %>
           <% unless assets.blank? then %>
             <div class="col-xs-12">

From 30a9c283fb8de3125a737f36bb0ed866ece3e944 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Zrim=C5=A1ek?= <mzrimsek@biosistemika.com>
Date: Wed, 11 Jan 2017 14:15:07 +0100
Subject: [PATCH 2/2] Added back bullets to images in protocol preview in
 protocol repository.

---
 app/views/protocols/index/_protocol_preview_modal_body.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/protocols/index/_protocol_preview_modal_body.html.erb b/app/views/protocols/index/_protocol_preview_modal_body.html.erb
index 1a927de67..a9ff09d72 100644
--- a/app/views/protocols/index/_protocol_preview_modal_body.html.erb
+++ b/app/views/protocols/index/_protocol_preview_modal_body.html.erb
@@ -109,7 +109,7 @@
                   <hr>
                   <div class="col-xs-12">
                     <strong><%= t("protocols.steps.files") %></strong>
-                    <ul class="list-unstyled">
+                    <ul>
                       <% assets.each do |asset| %>
                         <li>
                           <% if can_view_or_download_step_assets(@protocol) %>