scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-02 05:02:18 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix Dots and Checkbox visibility on experiment cards

Browse source
This commit is contained in:
Urban Rotnik 2021-02-12 13:25:12 +01:00
parent b831d5fa14
commit 1ae0b42c2c
4 changed files with 33 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/stylesheets/experiments.scss
View file

@ -233,6 +233,12 @@
}
}
}
&.readonly {
.experiment-name-cell {
margin-left: 0 !important;
}
}
}
}

8
app/permissions/project.rb
View file

@ -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

14
app/views/projects/show.html.erb
View file

@ -11,14 +11,18 @@
<%= render partial: 'projects/show/header' %>
<div class="project-show-container">
<div class="cards-wrapper" id="cardsWrapper" data-experiments-cards-url="<%= experiments_cards_project_path(@project) %>">
<div class="cards-wrapper <%= 'readonly' unless can_manage_experiments?(@project) %>"
id="cardsWrapper"
data-experiments-cards-url="<%= experiments_cards_project_path(@project) %>">
<!-- list -->
<div class="table-header">
<div class="table-header-cell select-all-checkboxes">
<div class="sci-checkbox-container">
<input value="1" type="checkbox" class="sci-checkbox select-all">
<span class="sci-checkbox-label"></span>
</div>
<% if can_manage_experiments?(@project) %>
<div class="sci-checkbox-container">
<input value="1" type="checkbox" class="sci-checkbox select-all">
<span class="sci-checkbox-label"></span>
</div>
<% end %>
</div>
<div class="table-header-cell"><%= t('experiments.card.name') %></div>
<div class="table-header-cell"><%= t('experiments.card.start_date') %></div>

20
app/views/projects/show/_experiment_card.html.erb
View file

@ -7,12 +7,14 @@
data-restorable="<%= experiment.archived? && can_restore_experiment?(experiment) %>"
data-duplicable="<%= can_clone_experiment?(experiment) %>"
>
<div class="checkbox-cell table-cell">
<div class="sci-checkbox-container">
<input value="1" type="checkbox" class="sci-checkbox experiment-card-selector">
<span class="sci-checkbox-label"></span>
<div class="checkbox-cell table-cell">
<% if can_manage_experiments?(experiment.project) %>
<div class="sci-checkbox-container">
<input value="1" type="checkbox" class="sci-checkbox experiment-card-selector">
<span class="sci-checkbox-label"></span>
</div>
<% end %>
</div>
</div>
<div class="experiment-name-cell table-cell">
<div class="workflow-img-container" list-render="true">
</div>
@ -22,9 +24,11 @@
<%= link_to experiment.name, canvas_experiment_path(experiment), title: experiment.name %>
<% end %>
</div>
<div class="actions actions-cell table-cell">
<%= render partial: 'projects/show/experiment_actions_dropdown.html.erb', locals: { experiment: experiment } %>
</div>
<div class="actions actions-cell table-cell">
<% if can_manage_experiments?(experiment.project) %>
<%= render partial: 'projects/show/experiment_actions_dropdown.html.erb', locals: { experiment: experiment } %>
<% end %>
</div>
<div class="dates-and-img-container">
<div class="dates-container">
<div class="data-row start-date-cell table-cell">