Change images_enabled to images

patrickpatrickpatrick · patrickpatrickpatrick · commit 8ebbd5b1228d · 2026-01-14T14:15:31.000Z
diff --git a/app/models/configurable_document_types/government_response.json b/app/models/configurable_document_types/government_response.json
@@ -79,7 +79,9 @@
     "publishing_api_schema_name": "news_article",
     "publishing_api_document_type": "government_response",
     "rendering_app": "frontend",
-    "images_enabled": true,
+    "images": {
+      "enabled": true
+    },
     "send_change_history": true,
     "file_attachments_enabled": true,
     "organisations": null,
diff --git a/app/models/configurable_document_types/history_page.json b/app/models/configurable_document_types/history_page.json
@@ -72,7 +72,9 @@
     "publishing_api_schema_name": "history",
     "publishing_api_document_type": "history",
     "rendering_app": "frontend",
-    "images_enabled": true,
+    "images": {
+      "enabled": true
+    },
     "send_change_history": false,
     "organisations": ["af07d5a5-df63-4ddc-9383-6a666845ebe9"],
     "backdating_enabled": false,
diff --git a/app/models/configurable_document_types/news_story.json b/app/models/configurable_document_types/news_story.json
@@ -79,7 +79,9 @@
     "publishing_api_schema_name": "news_article",
     "publishing_api_document_type": "news_story",
     "rendering_app": "frontend",
-    "images_enabled": true,
+    "images": {
+      "enabled": true
+    },
     "send_change_history": true,
     "file_attachments_enabled": true,
     "organisations": null,
diff --git a/app/models/configurable_document_types/press_release.json b/app/models/configurable_document_types/press_release.json
@@ -79,7 +79,9 @@
     "publishing_api_schema_name": "news_article",
     "publishing_api_document_type": "press_release",
     "rendering_app": "frontend",
-    "images_enabled": true,
+    "images": {
+      "enabled": true
+    },
     "send_change_history": true,
     "file_attachments_enabled": true,
     "organisations": null,
diff --git a/app/models/configurable_document_types/topical_event.json b/app/models/configurable_document_types/topical_event.json
@@ -80,7 +80,9 @@
     "publishing_api_schema_name": "topical_event",
     "publishing_api_document_type": "topical_event",
     "rendering_app": "collections",
-    "images_enabled": false,
+    "images": {
+      "enabled": true
+    },
     "send_change_history": true,
     "file_attachments_enabled": false,
     "organisations": null,
diff --git a/app/models/configurable_document_types/world_news_story.json b/app/models/configurable_document_types/world_news_story.json
@@ -78,7 +78,9 @@
     "publishing_api_schema_name": "news_article",
     "publishing_api_document_type": "world_news_story",
     "rendering_app": "frontend",
-    "images_enabled": true,
+    "images": {
+      "enabled": true
+    },
     "send_change_history": true,
     "file_attachments_enabled": true,
     "organisations": null,
diff --git a/app/models/standard_edition.rb b/app/models/standard_edition.rb
@@ -60,7 +60,7 @@ def locale_can_be_changed?
   end
 
   def allows_image_attachments?
-    type_instance.settings["images_enabled"]
+    (type_instance.settings["images"] || {})["enabled"]
   end
 
   def allows_file_attachments?
diff --git a/features/fixtures/test_configurable_document_type_group.json b/features/fixtures/test_configurable_document_type_group.json
@@ -49,7 +49,9 @@
       "organisations": null,
       "backdating_enabled": false,
       "translations_enabled": true,
-      "images_enabled": true
+      "images": {
+        "enabled": true
+      }
     }
   },
   {
@@ -102,7 +104,9 @@
       "organisations": null,
       "backdating_enabled": false,
       "translations_enabled": true,
-      "images_enabled": true
+      "images": {
+        "enabled": true
+      }
     }
   }
 ]
diff --git a/test/support/configurable_document_type_helper.rb b/test/support/configurable_document_type_helper.rb
@@ -32,7 +32,9 @@ def build_configurable_document_type(type, attributes = {})
           "publishing_api_schema_name" => "test_article",
           "publishing_api_document_type" => "test_story",
           "rendering_app" => "frontend",
-          "images_enabled" => false,
+          "images_enabled" => {
+            "enabled" => false,
+          },
           "organisations" => nil,
           "backdating_enabled" => false,
           "history_mode_enabled" => false,
diff --git a/test/unit/app/helpers/admin/tabbed_nav_helper_test.rb b/test/unit/app/helpers/admin/tabbed_nav_helper_test.rb
@@ -202,7 +202,7 @@ def current_user
   end
 
   test "#secondary_navigation_tabs_items for other persisted edition types with no attachments or images" do
-    ConfigurableDocumentType.setup_test_types(build_configurable_document_type("test_type", { "settings" => { "file_attachments_enabled" => true, "images_enabled" => true } }))
+    ConfigurableDocumentType.setup_test_types(build_configurable_document_type("test_type", { "settings" => { "file_attachments_enabled" => true, "images" => { "enabled" => true } } }))
 
     %i[detailed_guide publication standard_edition].each do |type|
       if type == :corporate_information_page
@@ -235,7 +235,7 @@ def current_user
   end
 
   test "#secondary_navigation_tabs_items for other persisted edition types with attachments and images" do
-    ConfigurableDocumentType.setup_test_types(build_configurable_document_type("test_type", { "settings" => { "file_attachments_enabled" => true, "images_enabled" => true } }))
+    ConfigurableDocumentType.setup_test_types(build_configurable_document_type("test_type", { "settings" => { "file_attachments_enabled" => true, "images" => { "enabled" => true } } }))
 
     %i[detailed_guide publication standard_edition].each do |type|
       if type == :corporate_information_page
diff --git a/test/unit/app/models/configurable_content_blocks/factory_test.rb b/test/unit/app/models/configurable_content_blocks/factory_test.rb
@@ -90,7 +90,9 @@ class ConfigurableContentBlocks::FactoryTest < ActiveSupport::TestCase
       build_configurable_document_type(
         "test_type_with_images_and_attachments", {
           "settings" => {
-            "images_enabled" => true,
+            "images" => {
+              "enabled" => true,
+            },
             "file_attachments_enabled" => true,
           },
         }
diff --git a/test/unit/app/models/standard_edition_test.rb b/test/unit/app/models/standard_edition_test.rb
@@ -69,15 +69,19 @@ class StandardEditionTest < ActiveSupport::TestCase
       build_configurable_document_type(
         "test_type_with_images", {
           "settings" => {
-            "images_enabled" => true,
+            "images" => {
+              "enabled": true,
+            },
           },
         }
       )
     test_type_without_images =
       build_configurable_document_type(
         "test_type_without_images", {
           "settings" => {
-            "images_enabled" => false,
+            "images" => {
+              "enabled": false,
+            },
           },
         }
       )

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,9 @@`
`49`	`49`	`"organisations": null,`
`50`	`50`	`"backdating_enabled": false,`
`51`	`51`	`"translations_enabled": true,`
`52`		`- "images_enabled": true`
	`52`	`+ "images": {`
	`53`	`+ "enabled": true`
	`54`	`+ }`
`53`	`55`	`}`
`54`	`56`	`},`
`55`	`57`	`{`
`@@ -102,7 +104,9 @@`
`102`	`104`	`"organisations": null,`
`103`	`105`	`"backdating_enabled": false,`
`104`	`106`	`"translations_enabled": true,`
`105`		`- "images_enabled": true`
	`107`	`+ "images": {`
	`108`	`+ "enabled": true`
	`109`	`+ }`
`106`	`110`	`}`
`107`	`111`	`}`
`108`	`112`	`]`