From 1ae0b42c2c625c9a5c4406f06095eff39a0282af Mon Sep 17 00:00:00 2001 From: Urban Rotnik Date: Fri, 12 Feb 2021 13:25:12 +0100 Subject: [PATCH] Fix Dots and Checkbox visibility on experiment cards --- app/assets/stylesheets/experiments.scss | 6 ++++++ app/permissions/project.rb | 8 ++++++-- app/views/projects/show.html.erb | 14 ++++++++----- .../projects/show/_experiment_card.html.erb | 20 +++++++++++-------- 4 files changed, 33 insertions(+), 15 deletions(-) diff --git a/app/assets/stylesheets/experiments.scss b/app/assets/stylesheets/experiments.scss index 98bc4b117..ac62ade47 100644 --- a/app/assets/stylesheets/experiments.scss +++ b/app/assets/stylesheets/experiments.scss @@ -233,6 +233,12 @@ } } } + + &.readonly { + .experiment-name-cell { + margin-left: 0 !important; + } + } } } diff --git a/app/permissions/project.rb b/app/permissions/project.rb index 84bd0243b..92347ff64 100644 --- a/app/permissions/project.rb +++ b/app/permissions/project.rb @@ -62,8 +62,12 @@ Canaid::Permissions.register_for(Project) do end # experiment: create - can :create_experiments do |user, project| - user.is_user_or_higher_of_project?(project) + %i(create_experiments + manage_experiments) + .each do |perm| + can perm do |user, project| + user.is_user_or_higher_of_project?(project) + end end # project: create comment diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index 469c4fb13..5e5b4a58f 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -11,14 +11,18 @@ <%= render partial: 'projects/show/header' %>
-
+
-
- - -
+ <% if can_manage_experiments?(@project) %> +
+ + +
+ <% end %>
<%= t('experiments.card.name') %>
<%= t('experiments.card.start_date') %>
diff --git a/app/views/projects/show/_experiment_card.html.erb b/app/views/projects/show/_experiment_card.html.erb index e919b9db2..ebc229e5a 100644 --- a/app/views/projects/show/_experiment_card.html.erb +++ b/app/views/projects/show/_experiment_card.html.erb @@ -7,12 +7,14 @@ data-restorable="<%= experiment.archived? && can_restore_experiment?(experiment) %>" data-duplicable="<%= can_clone_experiment?(experiment) %>" > -
-
- - +
+ <% if can_manage_experiments?(experiment.project) %> +
+ + +
+ <% end %>
-
@@ -22,9 +24,11 @@ <%= link_to experiment.name, canvas_experiment_path(experiment), title: experiment.name %> <% end %>
-
- <%= render partial: 'projects/show/experiment_actions_dropdown.html.erb', locals: { experiment: experiment } %> -
+
+ <% if can_manage_experiments?(experiment.project) %> + <%= render partial: 'projects/show/experiment_actions_dropdown.html.erb', locals: { experiment: experiment } %> + <% end %> +