From a591ea92efd534baf14d5f9fc549ba65dabc9894 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Mon, 1 Aug 2022 18:39:45 +0200
Subject: [PATCH] changed model in pype publisher to use new settings

---
 openpype/tools/pyblish_pype/model.py | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/openpype/tools/pyblish_pype/model.py b/openpype/tools/pyblish_pype/model.py
index 2931a379b3..31aa63677e 100644
--- a/openpype/tools/pyblish_pype/model.py
+++ b/openpype/tools/pyblish_pype/model.py
@@ -86,7 +86,7 @@ class IntentModel(QtGui.QStandardItemModel):
     First and default value is {"< Not Set >": None}
     """
 
-    default_item = {"< Not Set >": None}
+    default_empty_label = "< Not set >"
 
     def __init__(self, parent=None):
         super(IntentModel, self).__init__(parent)
@@ -102,27 +102,39 @@ class IntentModel(QtGui.QStandardItemModel):
         self._item_count = 0
         self.default_index = 0
 
-        intents_preset = (
+        intent_settings = (
             get_system_settings()
             .get("modules", {})
             .get("ftrack", {})
             .get("intent", {})
         )
 
-        default = intents_preset.get("default")
-        items = intents_preset.get("items", {})
+        items = intent_settings.get("items", {})
         if not items:
             return
 
-        for idx, item_value in enumerate(items.keys()):
+        allow_empty_intent = intent_settings.get("allow_empty_intent", True)
+        empty_intent_label = (
+            intent_settings.get("empty_intent_label")
+            or self.default_empty_label
+        )
+        listed_items = list(items.items())
+        if allow_empty_intent:
+            listed_items.insert(0, ("", empty_intent_label))
+
+        default = intent_settings.get("default")
+
+        for idx, item in enumerate(listed_items):
+            item_value = item[0]
             if item_value == default:
                 self.default_index = idx
                 break
 
-        self.add_items(items)
+        self._add_items(listed_items)
 
-    def add_items(self, items):
-        for value, label in items.items():
+    def _add_items(self, items):
+        for item in items:
+            value, label = item
             new_item = QtGui.QStandardItem()
             new_item.setData(label, QtCore.Qt.DisplayRole)
             new_item.setData(value, Roles.IntentItemValue)