diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/Preference_viewVcs/my_preferred_working_copy_list.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/Preference_viewVcs/my_preferred_working_copy_list.xml index 7c0505ed120a7da5ea177a4a1314ca9a1d64757e..4d3cb74562cace56c0f4f727c4d0b91997a0a797 100644 --- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/Preference_viewVcs/my_preferred_working_copy_list.xml +++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/Preference_viewVcs/my_preferred_working_copy_list.xml @@ -118,7 +118,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>python: here.getPreferredWorkingCopyList() or here.getPreferredSubversionWorkingCopyList()</string> </value> + <value> <string>python: here.getPreferredWorkingCopyList()</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_forge/bt/change_log b/bt5/erp5_forge/bt/change_log index 736bdb1777f2c1c5159292364f62a9aefc89f137..bfd84c1dc6f6680080fd2ba3d8e6bfd30cd1205b 100644 --- a/bt5/erp5_forge/bt/change_log +++ b/bt5/erp5_forge/bt/change_log @@ -1,3 +1,6 @@ +2012-10-04 arnaud.fontaine +* getPreferredSubversionWorkingCopyList() cannot be set properly. + 2012-04-19 Kazuhiko * add TypesTool_viewRoleInformationList that lists all Role Informations. diff --git a/bt5/erp5_forge/bt/revision b/bt5/erp5_forge/bt/revision index 4e36eb8e01c7e367d8f768d2e854fb16f30e639f..c029c62fcaf809a6aa3432ebfe1d5ced2dd8c929 100644 --- a/bt5/erp5_forge/bt/revision +++ b/bt5/erp5_forge/bt/revision @@ -1 +1 @@ -671 \ No newline at end of file +672 \ No newline at end of file diff --git a/product/ERP5/Document/BusinessTemplate.py b/product/ERP5/Document/BusinessTemplate.py index 13695c213daa9743e179cbc762d9ecae449212a9..a3576241f8385db7b78ef8548c8b649a96192b1e 100644 --- a/product/ERP5/Document/BusinessTemplate.py +++ b/product/ERP5/Document/BusinessTemplate.py @@ -5498,8 +5498,7 @@ Business Template is a set of definitions, such as skins, portal types and categ bt_name = self.getTitle() from App.config import getConfiguration instance_home = getConfiguration().instancehome - for path in (preferences.getPreferredWorkingCopyList() or # BBB - preferences.getPreferredSubversionWorkingCopyList() or ['bt5']): + for path in (preferences.getPreferredWorkingCopyList() or ['bt5']): if not os.path.isabs(path): path = os.path.join(instance_home, path) bt_path = os.path.join(path, bt_name) diff --git a/product/ERP5VCS/WorkingCopy.py b/product/ERP5VCS/WorkingCopy.py index 46789a33848c7f264d64a670c70e7addaac5ae6d..a4fee5af986c74196e50e177f14f53825ea771f1 100644 --- a/product/ERP5VCS/WorkingCopy.py +++ b/product/ERP5VCS/WorkingCopy.py @@ -97,8 +97,7 @@ class WorkingCopy(Implicit): def getWorkingCopyList(self): working_copy_list = [] preferences = self.getPortalObject().portal_preferences - for path in (preferences.getPreferredWorkingCopyList() or # BBB - preferences.getPreferredSubversionWorkingCopyList()): + for path in preferences.getPreferredWorkingCopyList(): try: getVcsTool(vcs=self.reference, path=path) working_copy_list.append(path)