consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Display title with an * when status is draft in version chooser

Browse Source
This commit is contained in:
Amaia Castro
2017-01-04 12:13:19 +01:00
parent c935373c07
commit 375602d297
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/legislation/draft_version.rb
View File

@@ -21,4 +21,8 @@ class Legislation::DraftVersion < ActiveRecord::Base
self.body_html = Redcarpet::Markdown.new(renderer).render(body) self.body_html = Redcarpet::Markdown.new(renderer).render(body)
self.toc_html = Redcarpet::Markdown.new(toc_renderer).render(body) self.toc_html = Redcarpet::Markdown.new(toc_renderer).render(body)
end end
def display_title
status == 'draft' ? "#{title} *" : title
end
end end

2
app/views/legislation/draft_versions/changes.html.erb
View File

@@ -11,7 +11,7 @@
<h3><%= t('.seeing_changelog_version') %></h3> <h3><%= t('.seeing_changelog_version') %></h3>
<div class="select-box"> <div class="select-box">
<%= form_tag go_to_version_legislation_process_draft_versions_path(@process), method: :get, id: "draft_version_go_to_version" do %> <%= 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" %> <%= hidden_field_tag "redirect_action", "changes" %>
<%= submit_tag t('legislation.draft_versions.show.select_version_submit'), class: "button" %> <%= submit_tag t('legislation.draft_versions.show.select_version_submit'), class: "button" %>
<% end %> <% end %>

2
app/views/legislation/draft_versions/show.html.erb
View File

@@ -11,7 +11,7 @@
<h3><%= t('.seeing_version') %></h3> <h3><%= t('.seeing_version') %></h3>
<div class="select-box"> <div class="select-box">
<%= form_tag go_to_version_legislation_process_draft_versions_path(@process), method: :get, id: "draft_version_go_to_version" do %> <%= 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" %> <%= submit_tag t('.select_version_submit'), class: "button" %>
<% end %> <% end %>
<span><%= link_to t('.see_changes'), legislation_process_draft_version_changes_path(@process, @draft_version) %></span> <span><%= link_to t('.see_changes'), legislation_process_draft_version_changes_path(@process, @draft_version) %></span>

4
spec/features/legislation/draft_versions_spec.rb
View File

@@ -37,7 +37,7 @@ feature 'Legislation Draft Versions' do
within('select#draft_version_id') do within('select#draft_version_id') do
expect(page).to have_content("Version 1") expect(page).to have_content("Version 1")
expect(page).to have_content("Version 2") expect(page).to have_content("Version 2")
expect(page).to have_content("Version 3") expect(page).to have_content("Version 3 *")
end end
end end
@@ -93,7 +93,7 @@ feature 'Legislation Draft Versions' do
within('select#draft_version_id') do within('select#draft_version_id') do
expect(page).to have_content("Version 1") expect(page).to have_content("Version 1")
expect(page).to have_content("Version 2") expect(page).to have_content("Version 2")
expect(page).to have_content("Version 3") expect(page).to have_content("Version 3 *")
end end
end end