Skip to content

Fix asset task view #403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BigRoy merged 3 commits into from
Jul 30, 2019
Merged

Fix asset task view #403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
593ebad
Fix: make import relative
jasperges Jul 8, 2019
54f1004
Make default task icon consistent with Avalon Launcher
jasperges Jul 26, 2019
9771dd3
Only show specific asset tasks
jasperges Jul 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion avalon/tools/contextmanager/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
from app import show
from .app import show
Copy link
Copy Markdown
Contributor

@mottosso mottosso Jul 26, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh wow, this was not already the case? Surprised this hasn't broken in some way already.

Copy link
Copy Markdown
Collaborator

@BigRoy BigRoy Jul 26, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well spotted, and thanks. I'm quite surprised too. But 🥇!


__all__ = ["show"]
10 changes: 1 addition & 9 deletions avalon/tools/projectmanager/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -229,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()

Expand Down