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

fix work with templates in workfiles tool

Browse source
This commit is contained in:
Jakub Trllo 2024-03-25 17:33:10 +01:00
parent 1271b74f43
commit 28db94fd7e
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
client/ayon_core/tools/workfiles/models/workfiles.py
View file

@ -302,10 +302,11 @@ class WorkareaModel:
file_template = anatomy.get_template_item(
"work", template_key, "file"
).template
)
file_template_str = file_template.template
template_has_version = "{version" in file_template
template_has_comment = "{comment" in file_template
template_has_version = "{version" in file_template_str
template_has_comment = "{comment" in file_template_str
comment_hints, comment = self._get_comments_from_root(
file_template,
@ -315,7 +316,8 @@ class WorkareaModel:
current_filename,
)
last_version = self._get_last_workfile_version(
workdir, file_template, fill_data, extensions)
workdir, file_template_str, fill_data, extensions
)
return {
"template_key": template_key,
@ -340,17 +342,18 @@ class WorkareaModel:
):
anatomy = self._controller.project_anatomy
fill_data = self._prepare_fill_data(folder_id, task_id)
template_key = self._get_template_key(fill_data)
workdir = self._get_workdir(anatomy, template_key, fill_data)
file_template = anatomy.get_template_item(
"work", template_key, "file"
).template
)
if use_last_version:
version = self._get_last_workfile_version(
workdir, file_template, fill_data, self._extensions
workdir, file_template.template, fill_data, self._extensions
)
fill_data["version"] = version
fill_data["ext"] = extension.lstrip(".")