From 593ebad3120685ac342e4a3a4236f7d886ec53a4 Mon Sep 17 00:00:00 2001 From: Jasper van Nieuwenhuizen Date: Mon, 8 Jul 2019 14:26:28 +0200 Subject: [PATCH 1/3] Fix: make import relative --- avalon/tools/contextmanager/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/avalon/tools/contextmanager/__init__.py b/avalon/tools/contextmanager/__init__.py index 0977b927c..6d11e9eee 100644 --- a/avalon/tools/contextmanager/__init__.py +++ b/avalon/tools/contextmanager/__init__.py @@ -1,3 +1,3 @@ -from app import show +from .app import show __all__ = ["show"] From 54f10049094c86f115fcb255355f36d814fb888f Mon Sep 17 00:00:00 2001 From: Jasper van Nieuwenhuizen Date: Fri, 26 Jul 2019 12:50:22 +0200 Subject: [PATCH 2/3] Make default task icon consistent with Avalon Launcher --- avalon/tools/projectmanager/model.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/avalon/tools/projectmanager/model.py b/avalon/tools/projectmanager/model.py index 5d0ae91a2..1301b338c 100644 --- a/avalon/tools/projectmanager/model.py +++ b/avalon/tools/projectmanager/model.py @@ -191,8 +191,7 @@ def __init__(self): super(TasksModel, self).__init__() self._num_assets = 0 self._icons = { - "__default__": awesome.icon("fa.folder-o", - color=style.colors.default) + "__default__": awesome.icon("fa.male", color=style.colors.default) } self._get_task_icons() From 9771dd3b8b4f72cc895a469c8a905579a1ae029e Mon Sep 17 00:00:00 2001 From: Jasper van Nieuwenhuizen Date: Fri, 26 Jul 2019 12:52:22 +0200 Subject: [PATCH 3/3] Only show specific asset tasks If the asset didn't have any tasks set, all tasks from the project configuration would be shown. This was really confusing and not what most people expect. This makes the behaviour more logical and also consistent with Avalon Launcher. --- avalon/tools/projectmanager/model.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/avalon/tools/projectmanager/model.py b/avalon/tools/projectmanager/model.py index 1301b338c..80b038792 100644 --- a/avalon/tools/projectmanager/model.py +++ b/avalon/tools/projectmanager/model.py @@ -228,13 +228,6 @@ def set_assets(self, asset_ids): asset_tasks = asset.get("data", {}).get("tasks", []) tasks.update(asset_tasks) - # If no asset tasks are defined, use the project tasks. - if assets and not tasks: - project = io.find_one({"type": "project"}) - tasks.update( - [task["name"] for task in project["config"].get("tasks", [])] - ) - self.clear() self.beginResetModel()