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
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Nikola Balog
erp5
Commits
16a5460d
Commit
16a5460d
authored
2 years ago
by
Xiaowu Zhang
Browse files
Options
Browse Files
Download
Plain Diff
fix data inconsistency after change preference
See merge request
nexedi/erp5!1723
parents
784c5ab2
457abc78
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
26 additions
and
22 deletions
+26
-22
bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModelColourAndMorphologieVariation_init.py
...apparel/ApparelModelColourAndMorphologieVariation_init.py
+5
-5
bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getIndividualVariationBaseCategoryItemList.py
...dm/Resource_getIndividualVariationBaseCategoryItemList.py
+6
-5
bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getOptionalVariationBaseCategoryItemList.py
..._pdm/Resource_getOptionalVariationBaseCategoryItemList.py
+6
-5
bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getVariationBaseCategoryItemList.py
...ins/erp5_pdm/Resource_getVariationBaseCategoryItemList.py
+6
-5
bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_crm/WebSection_getEventResourceItemList.py
...skins/erp5_web_crm/WebSection_getEventResourceItemList.py
+3
-2
No files found.
bt5/erp5_apparel/SkinTemplateItem/portal_skins/erp5_apparel/ApparelModelColourAndMorphologieVariation_init.py
View file @
16a5460d
...
...
@@ -9,19 +9,19 @@ if portal_type in context.getPortalVariationTypeList():
from
Products.ERP5Type.Cache
import
CachingMethod
#xxx default preference value [] for fix a bug
method_name
=
'getPreferred%sIndividualVariationBaseCategoryList'
%
portal_type
.
replace
(
' '
,
''
)
method
=
getattr
(
context
.
portal_preferences
,
method_name
)
url_list
=
method
([])
def
getIndividualVariationBaseCategoryList
(
portal_type
):
result
=
[]
#xxx default preference value [] for fix a bug
method_name
=
'getPreferred%sIndividualVariationBaseCategoryList'
%
portal_type
.
replace
(
' '
,
''
)
method
=
getattr
(
context
.
portal_preferences
,
method_name
)
url_list
=
method
([])
for
url
in
url_list
:
base_category
=
context
.
portal_categories
[
url
]
result
.
append
((
base_category
.
getTranslatedTitle
(),
base_category
.
getRelativeUrl
()))
return
result
getIndividualVariationBaseCategoryList
=
CachingMethod
(
getIndividualVariationBaseCategoryList
,
id
=
(
script
.
id
,
context
.
Localizer
.
get_selected_language
()),
id
=
(
script
.
id
,
context
.
Localizer
.
get_selected_language
()
,
url_list
),
cache_factory
=
'erp5_ui_long'
)
base_category_list
=
[
y
for
x
,
y
in
getIndividualVariationBaseCategoryList
(
portal_type
)]
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getIndividualVariationBaseCategoryItemList.py
View file @
16a5460d
...
...
@@ -10,19 +10,20 @@ if portal_type in context.getPortalVariationTypeList():
from
Products.ERP5Type.Cache
import
CachingMethod
#xxx default preference value [] for fix a bug
method_name
=
'getPreferred%sIndividualVariationBaseCategoryList'
%
portal_type
.
replace
(
' '
,
''
)
method
=
getattr
(
context
.
portal_preferences
,
method_name
)
url_list
=
method
([])
def
getIndividualVariationBaseCategoryList
(
portal_type
):
result
=
[]
#xxx default preference value [] for fix a bug
method_name
=
'getPreferred%sIndividualVariationBaseCategoryList'
%
portal_type
.
replace
(
' '
,
''
)
method
=
getattr
(
context
.
portal_preferences
,
method_name
)
url_list
=
method
([])
for
url
in
url_list
:
base_category
=
context
.
portal_categories
[
url
]
result
.
append
((
base_category
.
getTranslatedTitle
(),
base_category
.
getRelativeUrl
()))
return
result
getIndividualVariationBaseCategoryList
=
CachingMethod
(
getIndividualVariationBaseCategoryList
,
id
=
(
script
.
id
,
context
.
Localizer
.
get_selected_language
()),
id
=
(
script
.
id
,
context
.
Localizer
.
get_selected_language
()
,
url_list
),
cache_factory
=
'erp5_ui_long'
)
return
getIndividualVariationBaseCategoryList
(
portal_type
)
This diff is collapsed.
Click to expand it.
bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getOptionalVariationBaseCategoryItemList.py
View file @
16a5460d
...
...
@@ -8,19 +8,20 @@ portal_type = context.getPortalType()
from
Products.ERP5Type.Cache
import
CachingMethod
#xxx default preference value [] for fix a bug
method_name
=
'getPreferred%sOptionalVariationBaseCategoryList'
%
portal_type
.
replace
(
' '
,
''
)
method
=
getattr
(
context
.
portal_preferences
,
method_name
)
url_list
=
method
([])
def
getOptionalVariationBaseCategoryList
(
portal_type
):
result
=
[]
#xxx default preference value [] for fix a bug
method_name
=
'getPreferred%sOptionalVariationBaseCategoryList'
%
portal_type
.
replace
(
' '
,
''
)
method
=
getattr
(
context
.
portal_preferences
,
method_name
)
url_list
=
method
([])
for
url
in
url_list
:
base_category
=
context
.
portal_categories
[
url
]
result
.
append
((
base_category
.
getTranslatedTitle
(),
base_category
.
getRelativeUrl
()))
return
result
getOptionalVariationBaseCategoryList
=
CachingMethod
(
getOptionalVariationBaseCategoryList
,
id
=
(
script
.
id
,
context
.
Localizer
.
get_selected_language
()),
id
=
(
script
.
id
,
context
.
Localizer
.
get_selected_language
()
,
url_list
),
cache_factory
=
'erp5_ui_long'
)
return
getOptionalVariationBaseCategoryList
(
portal_type
)
This diff is collapsed.
Click to expand it.
bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_getVariationBaseCategoryItemList.py
View file @
16a5460d
...
...
@@ -8,19 +8,20 @@ portal_type = context.getPortalType()
from
Products.ERP5Type.Cache
import
CachingMethod
#xxx default preference value [] for fix a bug
method_name
=
'getPreferred%sVariationBaseCategoryList'
%
portal_type
.
replace
(
' '
,
''
)
method
=
getattr
(
context
.
portal_preferences
,
method_name
)
url_list
=
method
([])
def
getVariationsBaseCategoryList
(
portal_type
):
result
=
[]
#xxx default preference value [] for fix a bug
method_name
=
'getPreferred%sVariationBaseCategoryList'
%
portal_type
.
replace
(
' '
,
''
)
method
=
getattr
(
context
.
portal_preferences
,
method_name
)
url_list
=
method
([])
for
url
in
url_list
:
base_category
=
context
.
portal_categories
[
url
]
result
.
append
((
base_category
.
getTranslatedTitle
(),
base_category
.
getRelativeUrl
()))
return
result
getVariationsBaseCategoryList
=
CachingMethod
(
getVariationsBaseCategoryList
,
id
=
(
script
.
id
,
context
.
Localizer
.
get_selected_language
()),
id
=
(
script
.
id
,
context
.
Localizer
.
get_selected_language
()
,
url_list
),
cache_factory
=
'erp5_ui_long'
)
return
getVariationsBaseCategoryList
(
portal_type
)
This diff is collapsed.
Click to expand it.
bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_crm/WebSection_getEventResourceItemList.py
View file @
16a5460d
...
...
@@ -5,8 +5,9 @@ Use Auditor proxy role to let anonymous users accessing resources.
from
Products.ERP5Type.Cache
import
CachingMethod
portal
=
context
.
getPortalObject
()
use_uid
=
portal
.
portal_categories
.
getCategoryUid
(
portal
.
portal_preferences
.
getPreferredEventUse
(),
base_category
=
'use'
)
sql_kw
=
{
'portal_type'
:
portal
.
getPortalResourceTypeList
(),
'use_uid'
:
portal
.
portal_categories
.
getCategoryUid
(
portal
.
portal_preferences
.
getPreferredEventUse
(),
base_category
=
'use'
)
,
'use_uid'
:
use_uid
,
'validation_state'
:
'validated'
,
'sort_on'
:
'title'
}
...
...
@@ -14,7 +15,7 @@ def getResourceItemList():
return
[(
''
,
''
)]
+
[(
result
.
getTitle
(),
result
.
getRelativeUrl
())
for
result
in
portal
.
portal_catalog
(
**
sql_kw
)]
getResourceItemList
=
CachingMethod
(
getResourceItemList
,
id
=
(
script
.
id
,
context
.
Localizer
.
get_selected_language
()),
id
=
(
script
.
id
,
context
.
Localizer
.
get_selected_language
()
,
use_uid
),
cache_factory
=
'erp5_ui_long'
)
return
getResourceItemList
()
This diff is collapsed.
Click to expand it.
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