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

Merge pull request #3024 from mlorb/ml-sci-5293

Browse source 
[SCI-5293] Remove Archived results tab on archived Task
This commit is contained in:
mlorb 2021-01-04 10:25:18 +01:00 committed by GitHub
parent 67b8b13b81 21c0ea4f8d
commit 7b48869557
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/my_modules/status_flow/_task_flow_button.html.erb
View file

@ -5,7 +5,7 @@
<div class="dropdown sci-dropdown status-flow-dropdown"
data-status-changing="<%= my_module.status_changing %>"
data-status-check-url="<%= status_state_my_module_path(my_module) %>">
<button class="btn btn-secondary dropdown-toggle <%= 'disabled' if my_module.status_changing || my_module.archived? %>"
<button class="btn btn-secondary dropdown-toggle <%= 'disabled' if my_module.status_changing || my_module.archived_branch? %>"
type="button"
data-toggle="dropdown"
aria-haspopup="true"

4
app/views/shared/_secondary_navigation.html.erb
View file

@ -76,7 +76,7 @@
<% end %>
<li data-hook="secondary-navigation-tabs"></li>
<% if can_read_experiment?(@my_module.experiment) then %>
<% if can_read_experiment?(@my_module.experiment) && !@my_module.archived_branch? %>
<li id="archive-nav-tab" class="<%= "active" if is_module_archive? %>">
<a href="<%= archive_my_module_url(@my_module) %>" title="<%= t'nav2.modules.archive' %>">
<span class="hidden-sm hidden-md"><%=t "nav2.modules.archive" %></span>
@ -97,7 +97,7 @@
config: @inline_editable_title_config
} %>
<% else %>
<% if title_element.archived? %>
<% if title_element.archived_branch? %>
<i class="fas fa-archive"></i>&nbsp;
<% end %>
<%= title_element.name %>

18
app/views/shared/sidebar/_my_module.html.erb
View file

@ -1,6 +1,10 @@
<ul class="sidebar-branch">
<li class="sidebar-leaf">
<%= link_to t('sidebar.my_module.back_button'), canvas_experiment_path(@my_module.experiment), class: 'sidebar-link back-button' %>
<% if @my_module.archived_branch? %>
<%= link_to t('sidebar.my_module.back_button_archived'), module_archive_experiment_url(@my_module.experiment), class: 'sidebar-link back-button' %>
<% else %>
<%= link_to t('sidebar.my_module.back_button'), canvas_experiment_path(@my_module.experiment), class: 'sidebar-link back-button' %>
<% end %>
</li>
<li class="sidebar-leaf">
<%= link_to t('sidebar.my_module.steps'),
@ -18,9 +22,11 @@
class: "sidebar-link #{'selected' if is_module_activities?}" %>
</li>
<li data-hook="sidebar-my-module"></li>
<li class="sidebar-leaf">
<%= link_to t('sidebar.my_module.archive'),
archive_my_module_url(@my_module),
class: "sidebar-link #{'selected' if is_module_archive?}" %>
</li>
<% unless @my_module.archived_branch? %>
<li class="sidebar-leaf">
<%= link_to t('sidebar.my_module.archive'),
archive_my_module_url(@my_module),
class: "sidebar-link #{'selected' if is_module_archive?}" %>
</li>
<% end %>
</ul>

1
config/locales/en.yml
View file

@ -222,6 +222,7 @@ en:
my_module:
sidebar_title: "TASK"
back_button: "Back to all tasks"
back_button_archived: "Back to all archived tasks"
steps: "Protocols"
results: "Results"
activities: "Activity"