Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Romain Courteaud
erp5
Commits
0186ac99
Commit
0186ac99
authored
Jul 05, 2016
by
Nicolas Wavrant
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_upgrader: TemplateTool_checkCategoryNameConsistency shouldn't fail on activeSense
parent
fd95dea9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/TemplateTool_checkCategoryNameConsistency.py
...rp5_upgrader/TemplateTool_checkCategoryNameConsistency.py
+2
-3
bt5/erp5_upgrader/TestTemplateItem/portal_components/test.erp5.testUpgrader.py
...tTemplateItem/portal_components/test.erp5.testUpgrader.py
+2
-2
No files found.
bt5/erp5_upgrader/SkinTemplateItem/portal_skins/erp5_upgrader/TemplateTool_checkCategoryNameConsistency.py
View file @
0186ac99
...
@@ -8,7 +8,6 @@
...
@@ -8,7 +8,6 @@
# looking for the category by its new name.
# looking for the category by its new name.
portal
=
context
.
getPortalObject
()
portal
=
context
.
getPortalObject
()
portal_categories
=
portal
.
portal_categories
error_list
=
[]
error_list
=
[]
...
@@ -20,11 +19,11 @@ if not upgrade_list:
...
@@ -20,11 +19,11 @@ if not upgrade_list:
for
old_category_name
,
new_category_name
in
upgrade_list
:
for
old_category_name
,
new_category_name
in
upgrade_list
:
sensitive_portal_type_list
=
[]
sensitive_portal_type_list
=
[]
new_base_category
=
portal_categories
.
restrictedTraverse
(
new_category_name
).
getBaseCategoryId
()
new_base_category
_id
=
new_category_name
.
split
(
'/'
)[
0
]
# We gather portal types having the new category defined as a property
# We gather portal types having the new category defined as a property
for
portal_type
in
portal
.
portal_types
.
listTypeInfo
():
for
portal_type
in
portal
.
portal_types
.
listTypeInfo
():
if
new_base_category
in
portal_type
.
getInstancePropertyAndBaseCategoryList
():
if
new_base_category
_id
in
portal_type
.
getInstancePropertyAndBaseCategoryList
():
sensitive_portal_type_list
.
append
(
portal_type
.
getId
())
sensitive_portal_type_list
.
append
(
portal_type
.
getId
())
# if sensitive_portal_type_list is empty, we don't want to check all objects
# if sensitive_portal_type_list is empty, we don't want to check all objects
...
...
bt5/erp5_upgrader/TestTemplateItem/portal_components/test.erp5.testUpgrader.py
View file @
0186ac99
...
@@ -718,13 +718,13 @@ class TestUpgrader(ERP5TypeTestCase):
...
@@ -718,13 +718,13 @@ class TestUpgrader(ERP5TypeTestCase):
sequence_string = """
sequence_string = """
stepCreateOrganisationWithActivity
stepCreateOrganisationWithActivity
stepCreateCustomUpgradeCategoryListForRenaming
stepCreateCustomUpgradeCategoryListForRenaming
stepRenameCategoryActivityToBusinessCore
stepUpdateOrganisationPropertySheetManually
stepUpdateOrganisationPropertySheetManually
stepTic
stepTic
stepActiveSensePreUpgradeAlarm
stepActiveSensePreUpgradeAlarm
stepActiveSensePostUpgradeAlarm
stepActiveSensePostUpgradeAlarm
stepTic
stepTic
stepRunUpgrader
stepRunUpgrader
stepRenameCategoryActivityToBusinessCore
stepTic
stepTic
stepRunPostUpgrade
stepRunPostUpgrade
stepTic
stepTic
...
@@ -745,12 +745,12 @@ class TestUpgrader(ERP5TypeTestCase):
...
@@ -745,12 +745,12 @@ class TestUpgrader(ERP5TypeTestCase):
sequence_string = """
sequence_string = """
stepCreateOrganisationWithActivity
stepCreateOrganisationWithActivity
stepCreateCustomUpgradeCategoryListForMoving
stepCreateCustomUpgradeCategoryListForMoving
stepChangeCategoryRelativeUrl
stepTic
stepTic
stepActiveSensePreUpgradeAlarm
stepActiveSensePreUpgradeAlarm
stepActiveSensePostUpgradeAlarm
stepActiveSensePostUpgradeAlarm
stepTic
stepTic
stepRunUpgrader
stepRunUpgrader
stepChangeCategoryRelativeUrl
stepTic
stepTic
stepRunPostUpgrade
stepRunPostUpgrade
stepTic
stepTic
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment