mirror of
https://github.com/ynput/ayon-core.git
synced 2025-12-24 12:54:40 +01:00
Merge branch 'develop' into AY-7812_source-resolution-keys
This commit is contained in:
commit
4173193f5f
2 changed files with 10 additions and 5 deletions
|
|
@ -352,9 +352,6 @@ class ActionsModel:
|
|||
)
|
||||
|
||||
def _get_webaction_request_data(self, selection: LauncherActionSelection):
|
||||
if not selection.is_project_selected:
|
||||
return None
|
||||
|
||||
entity_type = None
|
||||
entity_id = None
|
||||
entity_subtypes = []
|
||||
|
|
@ -368,6 +365,13 @@ class ActionsModel:
|
|||
entity_id = selection.folder_entity["id"]
|
||||
entity_subtypes = [selection.folder_entity["folderType"]]
|
||||
|
||||
elif selection.is_project_selected:
|
||||
# Project actions are supported since AYON 1.9.1
|
||||
ma, mi, pa, _, _ = ayon_api.get_server_version_tuple()
|
||||
if (ma, mi, pa) < (1, 9, 1):
|
||||
return None
|
||||
entity_type = "project"
|
||||
|
||||
entity_ids = []
|
||||
if entity_id:
|
||||
entity_ids.append(entity_id)
|
||||
|
|
@ -381,10 +385,10 @@ class ActionsModel:
|
|||
}
|
||||
|
||||
def _get_webactions(self, selection: LauncherActionSelection):
|
||||
if not selection.is_project_selected:
|
||||
request_data = self._get_webaction_request_data(selection)
|
||||
if request_data is None:
|
||||
return []
|
||||
|
||||
request_data = self._get_webaction_request_data(selection)
|
||||
project_name = selection.project_name
|
||||
entity_id = None
|
||||
if request_data["entityIds"]:
|
||||
|
|
|
|||
|
|
@ -68,6 +68,7 @@ class HierarchyPage(QtWidgets.QWidget):
|
|||
# - Folders widget
|
||||
folders_widget = FoldersWidget(controller, content_body)
|
||||
folders_widget.set_header_visible(True)
|
||||
folders_widget.set_deselectable(True)
|
||||
|
||||
# - Tasks widget
|
||||
tasks_widget = TasksWidget(controller, content_body)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue