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

Merge pull request #3091 from aignatov-bio/ai-sci-5392-fixed-archived-experiment-dropdown-options_2

Browse source 
Fix archived experiment dropdown and archived view for projects page [SCI-5392]
This commit is contained in:
Alex Kriuchykhin 2021-01-18 10:32:27 +01:00 committed by GitHub
parent 496c106497 6011bb36b6
commit 64c0875b09
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/projects/index.js
View file

@ -328,7 +328,7 @@
loadCardsView();
Sidebar.reload({
sort: projectsCurrentSort,
view_mode: $('.projects-index').data('mode')
view_mode: $('.projects-index').data('view-mode')
});
}

6
app/permissions/experiment.rb
View file

@ -46,8 +46,10 @@ Canaid::Permissions.register_for(Experiment) do
# active
# experiment: restore
can :restore_experiment do |user, experiment|
user.is_user_or_higher_of_project?(experiment.project) &&
experiment.archived?
project = experiment.project
user.is_user_or_higher_of_project?(project) &&
experiment.archived? &&
project.active?
end
# experiment: copy

4
app/views/projects/index/_header.html.erb
View file

@ -16,7 +16,7 @@
<i class="fas fa-rocket button-icon"></i> <%= t('projects.index.header.active_projects') %>
</li>
<li class="view-switch-archived archive-switch" data-view-mode="active" data-url="<%= projects_path(mode: 'archived') %>">
<li class="view-switch-archived archive-switch" data-view-mode="active" data-url="<%= projects_path(view_mode: 'archived') %>">
<i class="fas fa-archive button-icon"></i> <%= t('projects.index.header.archived_projects') %>
</li>
<% end %>
@ -150,7 +150,7 @@
<span><i class="fas fa-sort-amount-down"></i></span>
<span class="caret"></span>
</button>
<ul id="sortMenuDropdown" class="dropdown-menu sort-projects-menu" aria-labelledby="sortMenu">
<ul id="sortMenuDropdown" class="dropdown-menu sort-projects-menu dropdown-menu-right" aria-labelledby="sortMenu">
<% %w(new old atoz ztoa archived_new archived_old).each_with_index do |sort, i| %>
<% if i.even? && i.positive? %>
<li class="divider" <%= i > 3 ? 'data-view-mode=archived' : '' %>></li>

2
app/views/projects/show/_experiment.html.erb
View file

@ -4,7 +4,7 @@
data-canvas-link="<%= canvas_experiment_url(experiment) %>"
>
<div class="panel-heading">
<% if can_manage_experiment?(experiment) %>
<% if can_manage_experiment?(experiment) || can_restore_experiment?(experiment) %>
<div class="dropdown pull-right">
<button class="btn btn-link dropdown-toggle"
type="button"