Merge pull request #9397 from alphagov/revert-history-mode-form-contr…

…ols-edition

Revert History Mode Controls view component addition

app/views/admin/editions/_standard_fields.html.erb

@@ -123,7 +123,29 @@
 
   <%= render "additional_significant_fields", form: form, edition: form.object %>
 
-  <%= render Admin::Editions::HistoryModeFormControls.new(@edition, current_user) %>
+  <% if edition.document&.live? && edition.can_be_marked_political? && can?(:mark_political, edition) %>
+    <div class="govuk-!-margin-bottom-8">
+      <%= form.hidden_field :political, value: "0" %>
+
+      <%= render "govuk_publishing_components/components/checkboxes", {
+        name: "edition[political]",
+        id: "edition_political",
+        heading: "Political",
+        heading_size: "l",
+        no_hint_text: true,
+        error: errors_for_input(edition.errors, :political),
+        items: [
+          {
+            label: "Associate with government of the time (currently set to #{edition.government&.name}).",
+            value: "1",
+            checked: edition.political,
+          },
+        ],
+      } %>
+
+      <p class="govuk-body"><%= link_to "Read the history mode guidance", "https://www.gov.uk/guidance/how-to-publish-on-gov-uk/creating-and-updating-pages#history-mode", class: "govuk-link" %> for more information as to what this means.</p>
+    </div>
+  <% end %>
 </div>
 
 <%= render Admin::Editions::FirstPublishedAtComponent.new(

config/features.rb

@@ -23,5 +23,4 @@
   #   description: "Take over the world."
   feature :govspeak_visual_editor, description: "Enables a visual editor for Govspeak fields", default: false
   feature :content_object_store, description: "Enables the object store for sharable content", default: Rails.env.development?
-  feature :override_government, description: "Enables GDS Editors and Admins to override the government associated with a document", default: false
 end

lib/whitehall/authority/rules/edition_rules.rb

@@ -19,7 +19,6 @@ def self.actions
         review_editorial_remark
         review_fact_check
         see
-        select_government_for_history_mode
         unpublish
         unwithdraw
         update
@@ -172,7 +171,7 @@ def departmental_editor_can?(action)
         can_publish?
       when :force_publish
         can_force_publish?
-      when :unpublish, :mark_political, :perform_administrative_tasks, :select_government_for_history_mode
+      when :unpublish, :mark_political, :perform_administrative_tasks
         false
       else
         true
@@ -201,7 +200,6 @@ def departmental_writer_can?(action)
         force_publish
         reject
         mark_political
-        select_government_for_history_mode
         perform_administrative_tasks
       ]
 

test/functional/admin/generic_editions_controller_tests/political_document_test.rb

@@ -31,12 +31,26 @@ class Admin::GenericEditionsController::PolticalDocumentsTest < ActionController
     assert_equal previous_government, new_draft.reload.government
   end
 
-  view_test "displays the history mode form controls for privileged users " do
+  view_test "displays the political checkbox for privileged users " do
+    create(:current_government)
     login_as :managing_editor
+    published_edition = create(:published_news_article, first_published_at: 2.days.ago)
+    new_draft = create(:news_article, document: published_edition.document, first_published_at: 2.days.ago)
+    get :edit, params: { id: new_draft }
+    assert_select "#edition_political"
+  end
+
+  view_test "doesn't display the political checkbox for non-privileged users " do
     published_edition = create(:published_news_article)
     new_draft = create(:news_article, document: published_edition.document)
     get :edit, params: { id: new_draft }
-    assert_select "#edition_political"
+    assert_select "#edition_political", count: 0
+  end
+
+  view_test "doesn't display the political checkbox on creation" do
+    login_as :managing_editor
+    get :new
+    assert_select "#edition_political", count: 0
   end
 
   def edit_historic_document