scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-30 20:23:14 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2994 from aignatov-bio/ai-sci-5285-fix-protocol-revert-from-repository

Browse source 
Fix protocol revert from repository [SCI-5285]
This commit is contained in:
Urban Rotnik 2020-12-04 12:25:36 +01:00 committed by GitHub
commit 342eb34925
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/steps/attachments/_list.html.erb
View file

@ -1,4 +1,4 @@
<% assets = step.assets %>
<% assets = step.assets.joins(file_attachment: :blob) %>
<% current_order = step.current_view_state(current_user).state.dig('assets', 'sort') %>
<div class="col-xs-12">
<hr>

2
config/locales/en.yml
View file

@ -2135,7 +2135,7 @@ en:
thumbnail_html: "<i class=\"fas fa-th-large\"></i> Medium"
list_html: "<i class=\"fas fa-list\"></i> List"
delete_file_modal:
title: "Delete attachement"
title: "Delete attachment"
description_1_html: "You are about to delete <b>%{file_name}</b></p>"
description_2: "Are you sure you want to continue?"
confirm_button: "Delete attachment"