From ce6524f46e4d4dc18b3fd480c0ac7dcbf30af27e Mon Sep 17 00:00:00 2001 From: Anton Date: Thu, 19 Jun 2025 13:17:08 +0200 Subject: [PATCH] Link step/results fixes [SCI-12034][SCI-12015][SCI-12035][SCI-12036] --- app/javascript/vue/protocol/step.vue | 38 +++++++++++-------- app/javascript/vue/results/result.vue | 38 +++++++++++-------- .../references/_result.html.erb | 2 +- config/locales/en.yml | 3 ++ 4 files changed, 48 insertions(+), 33 deletions(-) diff --git a/app/javascript/vue/protocol/step.vue b/app/javascript/vue/protocol/step.vue index df7537018..e08d9e51e 100644 --- a/app/javascript/vue/protocol/step.vue +++ b/app/javascript/vue/protocol/step.vue @@ -83,12 +83,14 @@ :data-object-type="step.attributes.type" tabindex="0" > - + - + + + <% if subject&.navigable? %> - <% path = subject.archived? ? archive_my_module_path(subject.my_module) : my_module_results_path(subject.my_module) %> + <% path = subject.archived? ? my_module_results_path(subject.my_module, result_id: subject.id, view_mode: :archived) : my_module_results_path(subject.my_module, result_id: subject.id) %> <%= route_to_other_team(path, team, subject.name&.truncate(Constants::NAME_TRUNCATION_LENGTH), diff --git a/config/locales/en.yml b/config/locales/en.yml index 80d159632..686e7675a 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1644,6 +1644,8 @@ en: comments_tab: "Comments" comment_title: "%{user} at %{time}:" link_to_step: "Link to step" + link_steps: "Link steps to this result" + linked_steps: "Linked steps" modals: link_steps: title: 'Link result to protocol steps' @@ -4055,6 +4057,7 @@ en: timestamp_iso_html: "Created on %{date} by %{user}" manage_links: "Manage links" link_results: "Link results to this step" + linked_results: "Linked results" status: complete: "Mark as done" uncomplete: "Unmark as done"