Skip to content
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

Jump to bottom

Workfiles tool: Fix update of context change #374

Merged
merged 2 commits into from
Apr 4, 2024
Merged

Workfiles tool: Fix update of context change #374

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a04bd1
fix update of context change
iLLiCiTiT Apr 4, 2024
2701d4b
removed unnecessary `reset` call
iLLiCiTiT Apr 4, 2024
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
39 changes: 18 additions & 21 deletions client/ayon_core/tools/workfiles/control.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,16 +659,7 @@ def _open_workfile(self, folder_id, task_id, filepath):
folder_id != self.get_current_folder_id()
or task_name != self.get_current_task_name()
):
folder_entity = ayon_api.get_folder_by_id(
event_data["project_name"],
event_data["folder_id"],
)
task_entity = ayon_api.get_task_by_name(
event_data["project_name"],
event_data["folder_id"],
event_data["task_name"]
)
change_current_context(folder_entity, task_entity)
self._change_current_context(project_name, folder_id, task_id)

self._host_open_workfile(filepath)

Expand Down Expand Up @@ -710,16 +701,8 @@ def _save_as_workfile(
folder_id != self.get_current_folder_id()
or task_name != self.get_current_task_name()
):
folder_entity = ayon_api.get_folder_by_id(
project_name, folder["id"]
)
task_entity = ayon_api.get_task_by_name(
project_name, folder["id"], task_name
)
change_current_context(
folder_entity,
task_entity,
template_key=template_key
self._change_current_context(
project_name, folder_id, task_id, template_key
)

# Save workfile
Expand All @@ -744,4 +727,18 @@ def _save_as_workfile(

# Trigger after save events
emit_event("workfile.save.after", event_data, source="workfiles.tool")
self.reset()

def _change_current_context(
self, project_name, folder_id, task_id, template_key=None
):
# Change current context
folder_entity = self.get_folder_entity(project_name, folder_id)
task_entity = self.get_task_entity(project_name, task_id)
change_current_context(
folder_entity,
task_entity,
template_key=template_key
)
self._current_folder_id = folder_entity["id"]
self._current_folder_path = folder_entity["path"]
self._current_task_name = task_entity["name"]
Loading