diff --git a/bt5/erp5_forge/ModuleComponentTemplateItem/portal_components/module.erp5.WorkingCopy.py b/bt5/erp5_forge/ModuleComponentTemplateItem/portal_components/module.erp5.WorkingCopy.py index e72afb78bbb46ddfa70a963c422862d40f71eb1f..7026e238bf34247cf3802d7dc9d22a0126d8eeb2 100644 --- a/bt5/erp5_forge/ModuleComponentTemplateItem/portal_components/module.erp5.WorkingCopy.py +++ b/bt5/erp5_forge/ModuleComponentTemplateItem/portal_components/module.erp5.WorkingCopy.py @@ -217,7 +217,7 @@ class WorkingCopy(six.with_metaclass(WorkingCopyMetaClass, Implicit)): hasDiff = lambda path: bool(getFilteredDiff(diff(path))) else: hasDiff = lambda path: True - self.__hasDiff = hasDiff + self.__hasDiff = hasDiff # pylint:disable=unused-private-member return hasDiff(path) def treeToXML(self, item) : diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_renameProxyField.py b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_renameProxyField.py index eaaf53e0f47f9b0f6d3bf8b782c30a818eaadc5b..5b27cde2dbcf15481f50f469b16595a25a939ffa 100644 --- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_renameProxyField.py +++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_toolbox/BusinessTemplate_renameProxyField.py @@ -67,7 +67,7 @@ def iterate(document, skin_path): sub_object.proxifyField(field_dict=proxify_dict) if sub_object.meta_type == "Folder": - skin_path = "%s/%s" % (skin_path, x.getId()) + skin_path = "%s/%s" % (skin_path, sub_object.getId()) iterate(sub_object, skin_path=skin_path) # Only search ProxyFields within skin folder defined by this business template diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_handleException.py b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_handleException.py index 99fe9deee936a5a1c6867859285f9938242616ff..ae184ec66b1e333ccdcc0d7a2fc975ae29facd2d 100644 --- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_handleException.py +++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_handleException.py @@ -2,6 +2,9 @@ from erp5.component.module.Git import GitLoginError from erp5.component.module.SubversionClient import SubversionSSLTrustError, SubversionLoginError import json +kw = {} +method = 'view' +message = 'Unknown error' try: raise exception except SubversionSSLTrustError as e: