From 324570a5fe2b400f288d1d95817c97bec3870aca Mon Sep 17 00:00:00 2001 From: Aaron Date: Wed, 22 Jan 2025 19:55:48 +0800 Subject: [PATCH 1/6] Add view history link --- app/views/qa/issues/show.html.erb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/views/qa/issues/show.html.erb b/app/views/qa/issues/show.html.erb index 8151d3474..424af1441 100644 --- a/app/views/qa/issues/show.html.erb +++ b/app/views/qa/issues/show.html.erb @@ -27,6 +27,9 @@ <%= link_to edit_project_qa_issue_path(current_project, @issue) do %> Edit <% end %> + <%= link_to project_issue_revisions_path(current_project, @issue) do %> + View History + <% end %> From 073a1fa3cc03c20b66b2910deda1d4bd43e165fd Mon Sep 17 00:00:00 2001 From: Aaron Date: Thu, 23 Jan 2025 15:31:31 +0800 Subject: [PATCH 2/6] Add return_to handling for the QA issues revisions page --- app/controllers/revisions_controller.rb | 3 ++- app/views/qa/issues/show.html.erb | 2 +- app/views/revisions/_breadcrumbs.html.erb | 9 +++++++-- app/views/revisions/show.html.erb | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/app/controllers/revisions_controller.rb b/app/controllers/revisions_controller.rb index 776376c02..40e2e79aa 100644 --- a/app/controllers/revisions_controller.rb +++ b/app/controllers/revisions_controller.rb @@ -7,13 +7,14 @@ class RevisionsController < AuthenticatedController before_action :load_record, except: [ :trash, :recover ] def index - redirect_to action: :show, id: @record.versions.last.try(:id) || 0 + redirect_to action: :show, id: @record.versions.last.try(:id) || 0, return_to: params[:return_to] end def show # Use `reorder`, not `order`, to override Paper Trail's default scope @revisions = @record.versions.includes(:item).reorder('created_at DESC') @revision = @revisions.find(params[:id]) + @return_to_qa = params[:return_to] == 'qa' if @revision.event == 'update' @diffed_revision = DiffedRevision.new(@revision, @record) diff --git a/app/views/qa/issues/show.html.erb b/app/views/qa/issues/show.html.erb index 424af1441..0525da65d 100644 --- a/app/views/qa/issues/show.html.erb +++ b/app/views/qa/issues/show.html.erb @@ -27,7 +27,7 @@ <%= link_to edit_project_qa_issue_path(current_project, @issue) do %> Edit <% end %> - <%= link_to project_issue_revisions_path(current_project, @issue) do %> + <%= link_to project_issue_revisions_path(current_project, @issue, return_to: :qa) do %> View History <% end %> diff --git a/app/views/revisions/_breadcrumbs.html.erb b/app/views/revisions/_breadcrumbs.html.erb index 2a7522581..3e43a3e89 100644 --- a/app/views/revisions/_breadcrumbs.html.erb +++ b/app/views/revisions/_breadcrumbs.html.erb @@ -13,8 +13,13 @@
  • <%= link_to @record.node.label, project_node_path(current_project, @record.node, tab: 'evidence-tab') %>
  • <%= link_to @record.title, project_node_evidence_path(current_project, @record.node, @record) %>
    • <% when Issue %> -
  • <%= link_to 'All issues', project_issues_path(current_project) %>
    • -
  • <%= link_to @record.title, project_issue_path(current_project, @record) %>
    • + <% if return_to_qa %> +
  • <%= link_to 'QA', project_qa_issues_path(current_project) %>
    • +
  • <%= link_to @record.title, project_qa_issue_path(current_project, @record) %>
    • + <% else %> +
  • <%= link_to 'All issues', project_issues_path(current_project) %>
    • +
  • <%= link_to @record.title, project_issue_path(current_project, @record) %>
    • + <% end %> <% when Note %>
  • Nodes
  • <%= link_to @record.node.label, project_node_path(current_project, @record.node, tab: 'notes-tab') %>
    • diff --git a/app/views/revisions/show.html.erb b/app/views/revisions/show.html.erb index 1bf5c50a2..3e39583b6 100644 --- a/app/views/revisions/show.html.erb +++ b/app/views/revisions/show.html.erb @@ -1,7 +1,7 @@ <% content_for :title, "#{@record.class.model_name} ##{@record.id} - comparing revisions" %> <% content_for :breadcrumbs do %> - <%= render partial: 'breadcrumbs' %> + <%= render partial: 'breadcrumbs', locals: { return_to_qa: @return_to_qa } %> <% end %> <% if @node %> From 76db83aa3b6c271a5f38db9293c85e91b85ba007 Mon Sep 17 00:00:00 2001 From: Aaron Date: Thu, 23 Jan 2025 16:20:56 +0800 Subject: [PATCH 3/6] Add changelog entry --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index dd9009c63..acd30ebef 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,6 @@ [v#.#.#] ([month] [YYYY]) - Hera: Add new layout with redesigned navigation + - QA: Add View History link when viewing Issues/Content blocks - Upgraded gems: - [gem] - Bugs fixes: From f158b596b47433322d61c776854e1bf11f0cdcb9 Mon Sep 17 00:00:00 2001 From: Matt Budz Date: Thu, 23 Jan 2025 13:53:33 +0100 Subject: [PATCH 4/6] add missing parent element + update margin --- app/assets/stylesheets/hera/modules.scss | 2 +- app/views/qa/issues/show.html.erb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/hera/modules.scss b/app/assets/stylesheets/hera/modules.scss index b0a656f6c..39e2bdcff 100644 --- a/app/assets/stylesheets/hera/modules.scss +++ b/app/assets/stylesheets/hera/modules.scss @@ -192,7 +192,7 @@ } &:last-of-type { - margin: 0 0.75rem; + margin-left: 0.25rem; } } } diff --git a/app/views/qa/issues/show.html.erb b/app/views/qa/issues/show.html.erb index 0525da65d..f5b72a1ff 100644 --- a/app/views/qa/issues/show.html.erb +++ b/app/views/qa/issues/show.html.erb @@ -27,6 +27,8 @@ <%= link_to edit_project_qa_issue_path(current_project, @issue) do %> Edit <% end %> + + <%= link_to project_issue_revisions_path(current_project, @issue, return_to: :qa) do %> View History <% end %> From fc96eb224b95e11036204f7d00ef8998c9066c38 Mon Sep 17 00:00:00 2001 From: Aaron Date: Fri, 24 Jan 2025 15:29:04 +0800 Subject: [PATCH 5/6] Add return_to params for the View History link --- app/helpers/revisions_helper.rb | 2 +- app/views/revisions/show.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/helpers/revisions_helper.rb b/app/helpers/revisions_helper.rb index 537d0de04..6d4b539b5 100644 --- a/app/helpers/revisions_helper.rb +++ b/app/helpers/revisions_helper.rb @@ -28,7 +28,7 @@ def record_revision_path(record, revision, params = {}) when Card project_board_list_card_revision_path(current_project, @board, @list, record, revision) when Issue - project_issue_revision_path(current_project, record, revision) + project_issue_revision_path(current_project, record, revision, params) when Note project_node_note_revision_path(current_project, record.node, record, revision) when Evidence diff --git a/app/views/revisions/show.html.erb b/app/views/revisions/show.html.erb index 3e39583b6..49a4feb57 100644 --- a/app/views/revisions/show.html.erb +++ b/app/views/revisions/show.html.erb @@ -43,7 +43,7 @@ <% if revision == @revision %> Currently Viewing <% elsif revision.event == "update" %> - <%= link_to "View Changes", record_revision_path(@record, revision) %> + <%= link_to "View Changes", record_revision_path(@record, revision, return_to: @return_to_qa ? :qa : nil) %> <% end %> <% end %> From f25925ebe8f533122f5c73e2332f403990bee742 Mon Sep 17 00:00:00 2001 From: Aaron Date: Thu, 30 Jan 2025 17:06:03 +0800 Subject: [PATCH 6/6] Use params :qa instead --- app/controllers/revisions_controller.rb | 4 ++-- app/helpers/revisions_helper.rb | 2 +- app/views/qa/issues/show.html.erb | 2 +- app/views/revisions/_breadcrumbs.html.erb | 2 +- app/views/revisions/show.html.erb | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/controllers/revisions_controller.rb b/app/controllers/revisions_controller.rb index 40e2e79aa..8a0844aff 100644 --- a/app/controllers/revisions_controller.rb +++ b/app/controllers/revisions_controller.rb @@ -7,14 +7,14 @@ class RevisionsController < AuthenticatedController before_action :load_record, except: [ :trash, :recover ] def index - redirect_to action: :show, id: @record.versions.last.try(:id) || 0, return_to: params[:return_to] + redirect_to action: :show, id: @record.versions.last.try(:id) || 0, qa: params[:qa] == 'true' end def show # Use `reorder`, not `order`, to override Paper Trail's default scope @revisions = @record.versions.includes(:item).reorder('created_at DESC') @revision = @revisions.find(params[:id]) - @return_to_qa = params[:return_to] == 'qa' + @qa = params[:qa] == 'true' if @revision.event == 'update' @diffed_revision = DiffedRevision.new(@revision, @record) diff --git a/app/helpers/revisions_helper.rb b/app/helpers/revisions_helper.rb index 6d4b539b5..0787910b4 100644 --- a/app/helpers/revisions_helper.rb +++ b/app/helpers/revisions_helper.rb @@ -28,7 +28,7 @@ def record_revision_path(record, revision, params = {}) when Card project_board_list_card_revision_path(current_project, @board, @list, record, revision) when Issue - project_issue_revision_path(current_project, record, revision, params) + project_issue_revision_path(current_project, record, revision, qa: params[:qa]) when Note project_node_note_revision_path(current_project, record.node, record, revision) when Evidence diff --git a/app/views/qa/issues/show.html.erb b/app/views/qa/issues/show.html.erb index f5b72a1ff..8068e0f43 100644 --- a/app/views/qa/issues/show.html.erb +++ b/app/views/qa/issues/show.html.erb @@ -29,7 +29,7 @@ <% end %> - <%= link_to project_issue_revisions_path(current_project, @issue, return_to: :qa) do %> + <%= link_to project_issue_revisions_path(current_project, @issue, qa: true) do %> View History <% end %> diff --git a/app/views/revisions/_breadcrumbs.html.erb b/app/views/revisions/_breadcrumbs.html.erb index 3e43a3e89..e28264c80 100644 --- a/app/views/revisions/_breadcrumbs.html.erb +++ b/app/views/revisions/_breadcrumbs.html.erb @@ -13,7 +13,7 @@
  • <%= link_to @record.node.label, project_node_path(current_project, @record.node, tab: 'evidence-tab') %>
  • <%= link_to @record.title, project_node_evidence_path(current_project, @record.node, @record) %>
    • <% when Issue %> - <% if return_to_qa %> + <% if qa %>
  • <%= link_to 'QA', project_qa_issues_path(current_project) %>
  • <%= link_to @record.title, project_qa_issue_path(current_project, @record) %>
    • <% else %> diff --git a/app/views/revisions/show.html.erb b/app/views/revisions/show.html.erb index 49a4feb57..cb8eb3c47 100644 --- a/app/views/revisions/show.html.erb +++ b/app/views/revisions/show.html.erb @@ -1,7 +1,7 @@ <% content_for :title, "#{@record.class.model_name} ##{@record.id} - comparing revisions" %> <% content_for :breadcrumbs do %> - <%= render partial: 'breadcrumbs', locals: { return_to_qa: @return_to_qa } %> + <%= render partial: 'breadcrumbs', locals: { qa: @qa } %> <% end %> <% if @node %> @@ -43,7 +43,7 @@ <% if revision == @revision %> Currently Viewing <% elsif revision.event == "update" %> - <%= link_to "View Changes", record_revision_path(@record, revision, return_to: @return_to_qa ? :qa : nil) %> + <%= link_to "View Changes", record_revision_path(@record, revision, qa: @qa) %> <% end %> <% end %>