diff --git a/app/controllers/experiments_controller.rb b/app/controllers/experiments_controller.rb index 66e89af2e..2f1b2fbdd 100644 --- a/app/controllers/experiments_controller.rb +++ b/app/controllers/experiments_controller.rb @@ -57,6 +57,7 @@ class ExperimentsController < ApplicationController end def canvas + redirect_to module_archive_experiment_path(@experiment) if @experiment.archived_branch? @project = @experiment.project @active_modules = @experiment.my_modules.active.includes(:tags, :inputs, :outputs) current_team_switch(@project.team) diff --git a/app/views/experiments/module_archive.html.erb b/app/views/experiments/module_archive.html.erb index eaeb9d819..64a94f485 100644 --- a/app/views/experiments/module_archive.html.erb +++ b/app/views/experiments/module_archive.html.erb @@ -1,5 +1,5 @@ <% provide(:head_title, t("experiments.module_archive.head_title", experiment: h(@experiment.name)).html_safe) %> -<% provide(:sidebar_title, t("sidebar.my_modules.sidebar_title")) %> +<% provide(:sidebar_title, t("sidebar.my_modules.sidebar_title_archived")) %> <% provide(:sidebar_url, experiment_sidebar_path(@experiment)) %> <%= content_for :sidebar do %> diff --git a/app/views/projects/show/_experiment.html.erb b/app/views/projects/show/_experiment.html.erb index 643fbe1f6..176f8b7e9 100644 --- a/app/views/projects/show/_experiment.html.erb +++ b/app/views/projects/show/_experiment.html.erb @@ -26,7 +26,13 @@ <% end %> <% end %> <% end %> -
<%= link_to experiment.name, canvas_experiment_path(experiment) %>
+
+ <% if experiment.archived_branch? %> + <%= link_to experiment.name, module_archive_experiment_path(experiment) %> + <% else %> + <%= link_to experiment.name, canvas_experiment_path(experiment) %> + <% end %> +
<% if experiment.archived? %>
diff --git a/app/views/shared/sidebar/_experiments.html.erb b/app/views/shared/sidebar/_experiments.html.erb index 05ffc7d23..d93c9daea 100644 --- a/app/views/shared/sidebar/_experiments.html.erb +++ b/app/views/shared/sidebar/_experiments.html.erb @@ -10,7 +10,11 @@ <% project.sorted_experiments(@current_sort, archived).each do |experiment| %> <% end %> <% unless archived %> diff --git a/app/views/shared/sidebar/_my_modules.html.erb b/app/views/shared/sidebar/_my_modules.html.erb index 33cddd135..e6358d4c2 100644 --- a/app/views/shared/sidebar/_my_modules.html.erb +++ b/app/views/shared/sidebar/_my_modules.html.erb @@ -14,7 +14,9 @@ <% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 140a95101..fbc8660dc 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -219,6 +219,7 @@ en: archived_experiments: "Archived experiments" my_modules: sidebar_title: "TASKS" + sidebar_title_archived: "ARCHIVED TASKS" back_button: "Back to experiments" back_to_archived_button: "Back to archived experiments" archived_button: "Archived tasks" @@ -227,7 +228,7 @@ en: sidebar_title: "TASK" back_button: "Back to all tasks" back_button_archived: "Back to all archived tasks" - steps: "Protocols" + steps: "Protocol" results: "Results" activities: "Activity" archive: "Archived results" @@ -245,7 +246,7 @@ en: reports: "Reports" archive: "Archived experiments" modules: - steps: "Protocols" + steps: "Protocol" results: "Results" activities: "Activity" archive: "Archived results"