diff --git a/product/ERP5/ERP5Site.py b/product/ERP5/ERP5Site.py index 0dd0c83e877151881a15ad45169a789ae9e0d618..25691e9ce60387e6fe579dcb40a4f50b6ed9d8c7 100644 --- a/product/ERP5/ERP5Site.py +++ b/product/ERP5/ERP5Site.py @@ -471,7 +471,8 @@ class ERP5Site(FolderMixIn, CMFSite, CacheCookieMixin): version_priority_list = property(getVersionPriorityList, setVersionPriorityList) - security.declarePrivate('getVersionPriorityNameList') + security.declareProtected(Permissions.AccessContentsInformation, + 'getVersionPriorityNameList') def getVersionPriorityNameList(self): # XXX-arnau: should be cached? return [name.split('|')[0].strip() diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewMigrateSourceCodeFromFilesystemDialog/my_version_priority.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewMigrateSourceCodeFromFilesystemDialog/my_version_priority.xml index 715b9d60c6f9a7611df1f5bd43a2079343a04e37..2bbb5c46b6bdfefa5b0bf2e9641243de59d6d956 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewMigrateSourceCodeFromFilesystemDialog/my_version_priority.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BusinessTemplate_viewMigrateSourceCodeFromFilesystemDialog/my_version_priority.xml @@ -123,7 +123,7 @@ <dictionary> <item> <key> <string>_text</string> </key> - <value> <string>python: [(v, v) for v in here.getPortalObject().getVersionPriorityNameList()]</string> </value> + <value> <string>python: [(v, v) for v in set(here.getPortalObject().getVersionPriorityNameList() + [v.split(\'|\')[0].strip() for v in here.getTemplateRegisteredVersionPrioritySelectionList()])]</string> </value> </item> </dictionary> </pickle> diff --git a/product/ERP5/bootstrap/erp5_core/bt/change_log b/product/ERP5/bootstrap/erp5_core/bt/change_log index 4f5545e248aeb31493601877e8ca8cbb4cdb3b75..b080e911e70c1de778dede5b3dcbf9e9ac3a2a5f 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/change_log +++ b/product/ERP5/bootstrap/erp5_core/bt/change_log @@ -1,3 +1,6 @@ +2012-03-06 arnaud.fontaine +* Show Component versions defined on the BusinessTemplate in ZODB Migration view. + 2012-03-06 arnaud.fontaine * Add registered version priority selection on BusinessTemplate_view for registering version priority of ZODB Components only for now. diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision index 54e9761c32c1046406e09a69aa080fb742cb071f..b58aa69e06e47b513bff11d997736ac5b74e704a 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/revision +++ b/product/ERP5/bootstrap/erp5_core/bt/revision @@ -1 +1 @@ -41027 \ No newline at end of file +41028 \ No newline at end of file