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

Fix bad step view rebase

Browse source
This commit is contained in:
Jure Grabnar 2016-09-01 12:51:30 +02:00
parent 3217271efe
commit 0e9756ad94
2 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile.lock
View file

@ -38,7 +38,6 @@ GEM
tzinfo (~> 1.1)
ajax-datatables-rails (0.3.1)
railties (>= 3.1)
algorithms (0.6.1)
ansi (1.5.0)
arel (6.0.3)
aspector (0.14.0)
@ -148,7 +147,6 @@ GEM
mail (2.6.4)
mime-types (>= 1.16, < 4)
mime-types (1.25.1)
mime-types-data (3.2016.0521)
mimemagic (0.3.0)
mini_portile2 (2.1.0)
minitest (5.9.0)

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

@ -72,14 +72,12 @@
<%= 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: 50) %></p>
<% if asset.can_perform_action("view") %>
<%= link_to "View", view_asset_url(id: asset) %>
<% end %>
<% if asset.can_perform_action("edit") %>
<%= link_to "Edit", edit_asset_url(id: asset) %>
<% end %>
<% else %>
<%= asset_loading_span(asset) %>
<% end %>
<% if asset.can_perform_action("view") %>
<%= link_to "View", view_asset_url(id: asset) %>
<% end %>
<% if asset.can_perform_action("edit") %>
<%= link_to "Edit", edit_asset_url(id: asset) %>
<% end %>
<% else %>
<%= asset_loading_span(asset) %>