From 918d23c9ab675dc702f4666128b47907d6de7109 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Tue, 29 Oct 2019 10:56:06 +0100 Subject: [PATCH 1/3] fixed role variable naming and way of getting asset --- pype/standalonepublish/widgets/model_tree.py | 4 ++-- pype/standalonepublish/widgets/widget_asset.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pype/standalonepublish/widgets/model_tree.py b/pype/standalonepublish/widgets/model_tree.py index e4f1aa5eb7..f37b7a00b2 100644 --- a/pype/standalonepublish/widgets/model_tree.py +++ b/pype/standalonepublish/widgets/model_tree.py @@ -5,7 +5,7 @@ from . import Node class TreeModel(QtCore.QAbstractItemModel): COLUMNS = list() - NodeRole = QtCore.Qt.UserRole + 1 + ItemRole = QtCore.Qt.UserRole + 1 def __init__(self, parent=None): super(TreeModel, self).__init__(parent) @@ -35,7 +35,7 @@ class TreeModel(QtCore.QAbstractItemModel): key = self.COLUMNS[column] return node.get(key, None) - if role == self.NodeRole: + if role == self.ItemRole: return index.internalPointer() def setData(self, index, value, role=QtCore.Qt.EditRole): diff --git a/pype/standalonepublish/widgets/widget_asset.py b/pype/standalonepublish/widgets/widget_asset.py index 1e3b2068bd..0bd7e67051 100644 --- a/pype/standalonepublish/widgets/widget_asset.py +++ b/pype/standalonepublish/widgets/widget_asset.py @@ -201,7 +201,7 @@ class AssetWidget(QtWidgets.QWidget): def collect_data(self): project = self.dbcon.find_one({'type': 'project'}) - asset = self.dbcon.find_one({'_id': self.get_active_asset()}) + asset = self.get_active_asset() try: index = self.task_view.selectedIndexes()[0] From 1b27cc59f8e03994b38d7d4bd8127e366c26d547 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Tue, 29 Oct 2019 11:05:31 +0100 Subject: [PATCH 2/3] get_parents get parents from entity instead of getting through all parents if possible --- pype/standalonepublish/widgets/widget_asset.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pype/standalonepublish/widgets/widget_asset.py b/pype/standalonepublish/widgets/widget_asset.py index 0bd7e67051..d9241bd91f 100644 --- a/pype/standalonepublish/widgets/widget_asset.py +++ b/pype/standalonepublish/widgets/widget_asset.py @@ -219,6 +219,10 @@ class AssetWidget(QtWidgets.QWidget): return data def get_parents(self, entity): + ent_parents = entity.get("data", {}).get("parents") + if ent_parents is not None and isinstance(ent_parents, list): + return ent_parents + output = [] if entity.get('data', {}).get('visualParent', None) is None: return output From e52e6241fb4cf29dffadb382033d7aeba7d2c055 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Tue, 29 Oct 2019 11:05:41 +0100 Subject: [PATCH 3/3] version is refreshed on pyblish close --- pype/standalonepublish/app.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pype/standalonepublish/app.py b/pype/standalonepublish/app.py index 37d4b1cd27..60274f6b0a 100644 --- a/pype/standalonepublish/app.py +++ b/pype/standalonepublish/app.py @@ -167,6 +167,8 @@ class Window(QtWidgets.QDialog): ''' if self.shadow_widget.isVisible(): self.shadow_widget.setVisible(False) + # Refresh version + self.widget_family.on_version_refresh() def set_valid_family(self, valid): ''' Sets `valid_family` attribute for validation