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: 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/controllers/revisions_controller.rb b/app/controllers/revisions_controller.rb index 776376c02..8a0844aff 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, 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]) + @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 537d0de04..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) + 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 8151d3474..8068e0f43 100644 --- a/app/views/qa/issues/show.html.erb +++ b/app/views/qa/issues/show.html.erb @@ -28,6 +28,11 @@ Edit <% end %> + + <%= link_to project_issue_revisions_path(current_project, @issue, qa: true) do %> + View History + <% end %> + <%= render partial: 'shared/textile_content', locals: { record: @issue, preview_path: preview_project_issue_path(current_project, @issue) } %> diff --git a/app/views/revisions/_breadcrumbs.html.erb b/app/views/revisions/_breadcrumbs.html.erb index 2a7522581..e28264c80 100644 --- a/app/views/revisions/_breadcrumbs.html.erb +++ b/app/views/revisions/_breadcrumbs.html.erb @@ -13,8 +13,13 @@