scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-05 22:44:22 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #401 from mz3944/mz-sci-878

Browse source 
Protocol repository - user cannot download files
This commit is contained in:
mz3944 2017-01-11 16:25:45 +01:00 committed by GitHub
commit aba12b9b2c
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/views/protocols/index/_protocol_preview_modal_body.html.erb
View file

@ -109,12 +109,20 @@
<hr>
<div class="col-xs-12">
<strong><%= t("protocols.steps.files") %></strong>
<ul class="list-unstyled">
<ul>
<% 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>

1
app/views/steps/_step.html.erb
View file

@ -57,6 +57,7 @@
<% end %>
</div>
<% end %>
<% assets = ordered_assets(step) %>
<% unless assets.blank? then %>
<div class="col-xs-12">