From d8c4444061cb2e93ea6aff3921871f8d4eac96c5 Mon Sep 17 00:00:00 2001 From: Kevin De Pelseneer Date: Tue, 27 Jun 2023 09:40:43 +0200 Subject: [PATCH] Change `can_manage?` to `can_edit?` and removed the template from the general information. --- .../single_pages/sample_upload_content.html.erb | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/app/views/single_pages/sample_upload_content.html.erb b/app/views/single_pages/sample_upload_content.html.erb index 7674c4c627..557ab82d94 100644 --- a/app/views/single_pages/sample_upload_content.html.erb +++ b/app/views/single_pages/sample_upload_content.html.erb @@ -1,7 +1,7 @@ <% can_upload = true %>
<%= folding_panel("General Information", true, :id => "general-information-panel") do %> - <% [@project, @study, @sample_type, @template]. map do | asset | %> + <% [@project, @study, @sample_type]. map do | asset | %> <% asset_name = asset.class.to_s.singularize %>

<%= asset_name %>

ID: <%= asset.id%>

@@ -15,16 +15,11 @@ <% can_upload = false %> <% end %> <% else %> - <% if asset.can_manage?%> -

<%= current_user.person.name %> can manage:

+ <% if asset.can_edit?%> +

<%= current_user.person.name %> can edit:

<% else %> -

<%= current_user.person.name %> can manage:

- <% -=begin%> - <% can_upload = false %> -<% -=end%> - <% can_upload = false unless asset_name == "Template" %> +

<%= current_user.person.name %> can edit:

+ <% can_upload = false %> <% end %> <% end %>