diff --git a/python/tk_multi_workfiles/file_item.py b/python/tk_multi_workfiles/file_item.py index f4a3b1d..4856053 100644 --- a/python/tk_multi_workfiles/file_item.py +++ b/python/tk_multi_workfiles/file_item.py @@ -167,7 +167,7 @@ def format_published_by_details(self): details_str += "Published on: Unknown" details_str += "
" if self.published_by and "name" in self.published_by: - details_str += ("Published by %s" % self.published_by["name"]) + details_str += ("Published by %s" % self.published_by["name"].decode("utf-8")) else: details_str += "Published by: Unknown" return details_str @@ -184,7 +184,7 @@ def format_modified_by_details(self): details_str += "Last updated: Unknown" details_str += "
" if self.modified_by and "name" in self.modified_by: - details_str += ("Updated by %s" % self.modified_by["name"]) + details_str += ("Updated by %s" % self.modified_by["name"].decode("utf-8")) else: details_str += "Updated by: Unknown" return details_str @@ -195,7 +195,7 @@ def format_publish_description(self): in UI elements """ if self.publish_description: - return ("%s" % self.publish_description) + return ("%s" % self.publish_description.decode("utf-8")) else: return "No description was entered for this publish" diff --git a/python/tk_multi_workfiles/versioning.py b/python/tk_multi_workfiles/versioning.py index 7c74183..9fe5ef9 100644 --- a/python/tk_multi_workfiles/versioning.py +++ b/python/tk_multi_workfiles/versioning.py @@ -82,6 +82,15 @@ def _show_change_version_dlg(self): if not work_path or not self._work_template.validate(work_path): msg = ("Unable to Change Version!\n\nPlease save the scene as a valid work file before continuing") QtGui.QMessageBox.information(None, "Unable To Change Version!", msg) + # current scene path must match work template and contain version: + + # try to launch "Shotgun Save As" command if we have it: + save_as_cmd = tank.platform.current_engine().commands.get("Shotgun Save As...") + if not save_as_cmd: + # try old name, just in case + save_as_cmd = tank.platform.current_engine().commands.get("Tank Save As...") + if save_as_cmd: + save_as_cmd["callback"]() return if not "version" in self._work_template.keys: