mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2025-09-06 21:24:23 +08:00
Code fixes for sidebar [SCI-2478]
This commit is contained in:
parent
2ddc0fb561
commit
58d8414f92
4 changed files with 6 additions and 6 deletions
|
@ -10,7 +10,7 @@ class ProjectsController < ApplicationController
|
|||
samples experiment_archive
|
||||
delete_samples samples_index)
|
||||
before_action :load_projects_tree, only: %i(index show samples archive
|
||||
experiment_archive)
|
||||
experiment_archive)
|
||||
before_action :load_archive_vars, only: :archive
|
||||
before_action :check_view_permissions, only: %i(show reports notifications
|
||||
samples experiment_archive
|
||||
|
|
|
@ -84,7 +84,7 @@
|
|||
<ul class="dropdown-menu" aria-labelledby="sortMenu">
|
||||
<% ["new", "old", "atoz", "ztoa"].each do |sort| %>
|
||||
<% if @current_sort != sort %>
|
||||
<li><a href="?<%= {team: @current_team_id, sort: sort}.reject{|k,v| v.to_s == "0"}.to_query %>"><%= t('projects.index.sort_' + sort) %></a></li>
|
||||
<li><a href="?<%= {team: @current_team.id, sort: sort}.reject{|k,v| v.to_s == "0"}.to_query %>"><%= t('projects.index.sort_' + sort) %></a></li>
|
||||
<% else %>
|
||||
<li class="disabled"><a href="#"><%= t('projects.index.sort_' + sort) %></a></li>
|
||||
<% end %>
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<% if experiment.active_my_modules.present? %>
|
||||
<ul>
|
||||
<% experiment.active_my_modules.each do |my_module| %>
|
||||
<% experiment.active_my_modules.sort_by{ |m| m.workflow_order }.each do |my_module| %>
|
||||
|
||||
<li class="leaf <%= "active" if currently_active? my_module %>"
|
||||
data-module-id="<%= my_module.id %>">
|
||||
<span class="tree-link second-indent">
|
||||
|
@ -14,6 +15,7 @@
|
|||
<% end %>
|
||||
</span>
|
||||
</li>
|
||||
|
||||
<% end %>
|
||||
</ul>
|
||||
<% end %>
|
||||
|
|
|
@ -1,9 +1,7 @@
|
|||
<ul>
|
||||
<% if @projects_tree.present? then %>
|
||||
<% @projects_tree.each do |project| %>
|
||||
<% if (project_page? ||
|
||||
sample_types_page_project? ||
|
||||
sample_groups_page_project?) && project == @project %>
|
||||
<% if project_page? && project == @project %>
|
||||
<li class="active" data-parent="candidate">
|
||||
<span class="tree-link line-wrap no-indent">
|
||||
<i class="no-arrow"></i>
|
||||
|
|
Loading…
Add table
Reference in a new issue