From 0e9756ad94624ca00697ca4565cece24f944d702 Mon Sep 17 00:00:00 2001 From: Jure Grabnar Date: Thu, 1 Sep 2016 12:51:30 +0200 Subject: [PATCH] Fix bad step view rebase --- Gemfile.lock | 2 -- app/views/steps/_step.html.erb | 14 ++++++-------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1296fb027..25a3dca4f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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) diff --git a/app/views/steps/_step.html.erb b/app/views/steps/_step.html.erb index 95be5bcf5..26a24e6ae 100644 --- a/app/views/steps/_step.html.erb +++ b/app/views/steps/_step.html.erb @@ -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? %>

<%= truncate(asset.file_file_name, length: 50) %>

- <% 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) %>