diff --git a/app/models/legislation/draft_version.rb b/app/models/legislation/draft_version.rb index 3cbbce567..29b22e5a6 100644 --- a/app/models/legislation/draft_version.rb +++ b/app/models/legislation/draft_version.rb @@ -21,4 +21,8 @@ class Legislation::DraftVersion < ActiveRecord::Base self.body_html = Redcarpet::Markdown.new(renderer).render(body) self.toc_html = Redcarpet::Markdown.new(toc_renderer).render(body) end + + def display_title + status == 'draft' ? "#{title} *" : title + end end diff --git a/app/views/legislation/draft_versions/changes.html.erb b/app/views/legislation/draft_versions/changes.html.erb index 0f98ad12d..0f2015cda 100644 --- a/app/views/legislation/draft_versions/changes.html.erb +++ b/app/views/legislation/draft_versions/changes.html.erb @@ -11,7 +11,7 @@

<%= t('.seeing_changelog_version') %>

<%= form_tag go_to_version_legislation_process_draft_versions_path(@process), method: :get, id: "draft_version_go_to_version" do %> - <%= select_tag "draft_version_id", options_from_collection_for_select(@draft_versions_list, 'id', 'title', @draft_version.id), "aria-label": t('legislation.draft_versions.show.select_draft_version') %> + <%= select_tag "draft_version_id", options_from_collection_for_select(@draft_versions_list, 'id', 'display_title', @draft_version.id), "aria-label": t('legislation.draft_versions.show.select_draft_version') %> <%= hidden_field_tag "redirect_action", "changes" %> <%= submit_tag t('legislation.draft_versions.show.select_version_submit'), class: "button" %> <% end %> diff --git a/app/views/legislation/draft_versions/show.html.erb b/app/views/legislation/draft_versions/show.html.erb index 5635e335a..5ff3a76ba 100644 --- a/app/views/legislation/draft_versions/show.html.erb +++ b/app/views/legislation/draft_versions/show.html.erb @@ -11,7 +11,7 @@

<%= t('.seeing_version') %>

<%= form_tag go_to_version_legislation_process_draft_versions_path(@process), method: :get, id: "draft_version_go_to_version" do %> - <%= select_tag "draft_version_id", options_from_collection_for_select(@draft_versions_list, 'id', 'title', @draft_version.id), "aria-label": t('.select_draft_version') %> + <%= select_tag "draft_version_id", options_from_collection_for_select(@draft_versions_list, 'id', 'display_title', @draft_version.id), "aria-label": t('.select_draft_version') %> <%= submit_tag t('.select_version_submit'), class: "button" %> <% end %> <%= link_to t('.see_changes'), legislation_process_draft_version_changes_path(@process, @draft_version) %> diff --git a/spec/features/legislation/draft_versions_spec.rb b/spec/features/legislation/draft_versions_spec.rb index a888a8427..594cb8cdc 100644 --- a/spec/features/legislation/draft_versions_spec.rb +++ b/spec/features/legislation/draft_versions_spec.rb @@ -37,7 +37,7 @@ feature 'Legislation Draft Versions' do within('select#draft_version_id') do expect(page).to have_content("Version 1") expect(page).to have_content("Version 2") - expect(page).to have_content("Version 3") + expect(page).to have_content("Version 3 *") end end @@ -93,7 +93,7 @@ feature 'Legislation Draft Versions' do within('select#draft_version_id') do expect(page).to have_content("Version 1") expect(page).to have_content("Version 2") - expect(page).to have_content("Version 3") + expect(page).to have_content("Version 3 *") end end