Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-25 05:14:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merged in hotfix/standalone_model_fix (pull request #338)

Browse source 
Hotfix/standalone model fix
This commit is contained in:
Jakub Trllo 2019-10-29 14:17:22 +00:00 • committed by Jakub Ježek
commit e24461007d
3 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pype/standalonepublish/app.py
View file

@ -167,6 +167,8 @@ class Window(QtWidgets.QDialog):
''' '''
if self.shadow_widget.isVisible(): if self.shadow_widget.isVisible():
self.shadow_widget.setVisible(False) self.shadow_widget.setVisible(False)
# Refresh version
self.widget_family.on_version_refresh()
def set_valid_family(self, valid): def set_valid_family(self, valid):
''' Sets `valid_family` attribute for validation ''' Sets `valid_family` attribute for validation

4
pype/standalonepublish/widgets/model_tree.py
View file

@ -5,7 +5,7 @@ from . import Node
class TreeModel(QtCore.QAbstractItemModel): class TreeModel(QtCore.QAbstractItemModel):
COLUMNS = list() COLUMNS = list()
NodeRole = QtCore.Qt.UserRole + 1 ItemRole = QtCore.Qt.UserRole + 1
def __init__(self, parent=None): def __init__(self, parent=None):
super(TreeModel, self).__init__(parent) super(TreeModel, self).__init__(parent)
@ -35,7 +35,7 @@ class TreeModel(QtCore.QAbstractItemModel):
key = self.COLUMNS[column] key = self.COLUMNS[column]
return node.get(key, None) return node.get(key, None)
if role == self.NodeRole: if role == self.ItemRole:
return index.internalPointer() return index.internalPointer()
def setData(self, index, value, role=QtCore.Qt.EditRole): def setData(self, index, value, role=QtCore.Qt.EditRole):

6
pype/standalonepublish/widgets/widget_asset.py
View file

@ -201,7 +201,7 @@ class AssetWidget(QtWidgets.QWidget):
def collect_data(self): def collect_data(self):
project = self.dbcon.find_one({'type': 'project'}) project = self.dbcon.find_one({'type': 'project'})
asset = self.dbcon.find_one({'_id': self.get_active_asset()}) asset = self.get_active_asset()
try: try:
index = self.task_view.selectedIndexes()[0] index = self.task_view.selectedIndexes()[0]
@ -219,6 +219,10 @@ class AssetWidget(QtWidgets.QWidget):
return data return data
def get_parents(self, entity): 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 = [] output = []
if entity.get('data', {}).get('visualParent', None) is None: if entity.get('data', {}).get('visualParent', None) is None:
return output return output