mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2024-09-21 15:36:22 +08:00
Merge pull request #3091 from aignatov-bio/ai-sci-5392-fixed-archived-experiment-dropdown-options_2
Fix archived experiment dropdown and archived view for projects page [SCI-5392]
This commit is contained in:
commit
64c0875b09
|
@ -328,7 +328,7 @@
|
||||||
loadCardsView();
|
loadCardsView();
|
||||||
Sidebar.reload({
|
Sidebar.reload({
|
||||||
sort: projectsCurrentSort,
|
sort: projectsCurrentSort,
|
||||||
view_mode: $('.projects-index').data('mode')
|
view_mode: $('.projects-index').data('view-mode')
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -46,8 +46,10 @@ Canaid::Permissions.register_for(Experiment) do
|
||||||
# active
|
# active
|
||||||
# experiment: restore
|
# experiment: restore
|
||||||
can :restore_experiment do |user, experiment|
|
can :restore_experiment do |user, experiment|
|
||||||
user.is_user_or_higher_of_project?(experiment.project) &&
|
project = experiment.project
|
||||||
experiment.archived?
|
user.is_user_or_higher_of_project?(project) &&
|
||||||
|
experiment.archived? &&
|
||||||
|
project.active?
|
||||||
end
|
end
|
||||||
|
|
||||||
# experiment: copy
|
# experiment: copy
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
<i class="fas fa-rocket button-icon"></i> <%= t('projects.index.header.active_projects') %>
|
<i class="fas fa-rocket button-icon"></i> <%= t('projects.index.header.active_projects') %>
|
||||||
</li>
|
</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') %>
|
<i class="fas fa-archive button-icon"></i> <%= t('projects.index.header.archived_projects') %>
|
||||||
</li>
|
</li>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
@ -150,7 +150,7 @@
|
||||||
<span><i class="fas fa-sort-amount-down"></i></span>
|
<span><i class="fas fa-sort-amount-down"></i></span>
|
||||||
<span class="caret"></span>
|
<span class="caret"></span>
|
||||||
</button>
|
</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| %>
|
<% %w(new old atoz ztoa archived_new archived_old).each_with_index do |sort, i| %>
|
||||||
<% if i.even? && i.positive? %>
|
<% if i.even? && i.positive? %>
|
||||||
<li class="divider" <%= i > 3 ? 'data-view-mode=archived' : '' %>></li>
|
<li class="divider" <%= i > 3 ? 'data-view-mode=archived' : '' %>></li>
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
data-canvas-link="<%= canvas_experiment_url(experiment) %>"
|
data-canvas-link="<%= canvas_experiment_url(experiment) %>"
|
||||||
>
|
>
|
||||||
<div class="panel-heading">
|
<div class="panel-heading">
|
||||||
<% if can_manage_experiment?(experiment) %>
|
<% if can_manage_experiment?(experiment) || can_restore_experiment?(experiment) %>
|
||||||
<div class="dropdown pull-right">
|
<div class="dropdown pull-right">
|
||||||
<button class="btn btn-link dropdown-toggle"
|
<button class="btn btn-link dropdown-toggle"
|
||||||
type="button"
|
type="button"
|
||||||
|
|
Loading…
Reference in a new issue