From b47143b472eec6bb35ced0bbbb1d2b9a77c9acd4 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Thu, 25 May 2023 17:41:36 +0200
Subject: [PATCH 1/2] collect frames to fix settings

---
 .../plugins/publish/collect_frames_fix.py     | 21 ++++++++++++++-----
 .../defaults/project_settings/global.json     |  8 ++++++-
 .../schemas/schema_global_publish.json        | 20 ++++++++++++++++++
 3 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/openpype/plugins/publish/collect_frames_fix.py b/openpype/plugins/publish/collect_frames_fix.py
index bdd49585a5..837738eb06 100644
--- a/openpype/plugins/publish/collect_frames_fix.py
+++ b/openpype/plugins/publish/collect_frames_fix.py
@@ -26,11 +26,13 @@ class CollectFramesFixDef(
     targets = ["local"]
     hosts = ["nuke"]
     families = ["render", "prerender"]
-    enabled = True
+
+    rewrite_version_enable = False
 
     def process(self, instance):
         attribute_values = self.get_attr_values_from_data(instance.data)
         frames_to_fix = attribute_values.get("frames_to_fix")
+
         rewrite_version = attribute_values.get("rewrite_version")
 
         if frames_to_fix:
@@ -71,10 +73,19 @@ class CollectFramesFixDef(
 
     @classmethod
     def get_attribute_defs(cls):
-        return [
+        attributes = [
             TextDef("frames_to_fix", label="Frames to fix",
                     placeholder="5,10-15",
-                    regex="[0-9,-]+"),
-            BoolDef("rewrite_version", label="Rewrite latest version",
-                    default=False),
+                    regex="[0-9,-]+")
         ]
+
+        if cls.rewrite_version_enable:
+            attributes.append(
+                BoolDef(
+                    "rewrite_version",
+                    label="Rewrite latest version",
+                    default=False
+                )
+            )
+
+        return attributes
diff --git a/openpype/settings/defaults/project_settings/global.json b/openpype/settings/defaults/project_settings/global.json
index 75f335f1de..002e547feb 100644
--- a/openpype/settings/defaults/project_settings/global.json
+++ b/openpype/settings/defaults/project_settings/global.json
@@ -46,6 +46,10 @@
             "enabled": false,
             "families": []
         },
+        "CollectFramesFixDef": {
+            "enabled": true,
+            "rewrite_version_enable": true
+        },
         "ValidateEditorialAssetName": {
             "enabled": true,
             "optional": false
@@ -252,7 +256,9 @@
                     }
                 },
                 {
-                    "families": ["review"],
+                    "families": [
+                        "review"
+                    ],
                     "hosts": [
                         "maya",
                         "houdini"
diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json
index a7617918a3..8000e6156b 100644
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json
@@ -81,6 +81,26 @@
                 }
             ]
         },
+        {
+            "type": "dict",
+            "collapsible": true,
+            "checkbox_key": "enabled",
+            "key": "CollectFramesFixDef",
+            "label": "Collect Frames to Fix",
+            "is_group": true,
+            "children": [
+                {
+                    "type": "boolean",
+                    "key": "enabled",
+                    "label": "Enabled"
+                },
+                {
+                    "type": "boolean",
+                    "key": "rewrite_version_enable",
+                    "label": "Rewrite latest version"
+                }
+            ]
+        },
         {
             "type": "dict",
             "collapsible": true,

From 31da5582fca78f9f84977700c69523e077df6e19 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Thu, 25 May 2023 21:39:07 +0200
Subject: [PATCH 2/2] make understandable label in settings

---
 .../schemas/projects_schema/schemas/schema_global_publish.json  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json
index 8000e6156b..3164cfb62d 100644
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_global_publish.json
@@ -97,7 +97,7 @@
                 {
                     "type": "boolean",
                     "key": "rewrite_version_enable",
-                    "label": "Rewrite latest version"
+                    "label": "Show 'Rewrite latest version' toggle"
                 }
             ]
         },