scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 15:36:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #105 from biosistemika/lm-jg-archive-experiment

Browse source 
Add missing commits for showing image and not able to preview
This commit is contained in:
Luka Murn 2016-08-26 16:52:25 +02:00 committed by GitHub
parent d886d05ccb a0311970f8
commit 5c13c89156
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/helpers/permission_helper.rb
View file

@ -138,7 +138,12 @@ module PermissionHelper
# ---- Some things are disabled for archived experiment ----
around [
:can_edit_experiment,
:can_view_experiment,
:can_view_experiment_archive,
:can_archive_experiment,
:can_view_experiment_samples,
:can_clone_experiment,
:can_move_experiment,
:can_edit_canvas,
:can_reposition_modules,
:can_edit_connections,

8
app/views/projects/experiment_archive/_experiment.html.erb
View file

@ -19,10 +19,16 @@
</ul>
</div>
<h3 class="panel-title"><%= link_to experiment.name, canvas_experiment_path(experiment) %></h3>
<h3 class="panel-title"><%= experiment.name %></h3>
</div>
<div class="panel-body">
<% if experiment.workflowimg? %>
<div class="workflowimg-container">
<%= image_tag(experiment.workflowimg.expiring_url(30),
class: 'img-responsive center-block') %>
</div>
<% end %>
<div class="row">
<div class="col-xs-6">
<%=t "projects.experiment_archive.archived_on" %>