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
Titouan Soulard
erp5
Commits
6799542c
Commit
6799542c
authored
Jul 23, 2020
by
Xiaowu Zhang
Browse files
Options
Browse Files
Download
Plain Diff
erp5_corporate_identity: try to get 'en' logo if user language logo is not presented
See merge request
nexedi/erp5!1216
parents
b4c6d186
a038a43e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
3 deletions
+10
-3
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/Base_getTemplateProxyParameter.py
...erp5_corporate_identity/Base_getTemplateProxyParameter.py
+10
-3
No files found.
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/Base_getTemplateProxyParameter.py
View file @
6799542c
...
@@ -299,13 +299,20 @@ if pass_parameter is not None and pass_source_data is not None:
...
@@ -299,13 +299,20 @@ if pass_parameter is not None and pass_source_data is not None:
use_language
=
context
.
getLanguage
()
or
"en"
use_language
=
context
.
getLanguage
()
or
"en"
except
AttributeError
:
except
AttributeError
:
use_language
=
"en"
use_language
=
"en"
logo_list
=
portal_object
.
portal_catalog
(
return
populateImageDict
(
portal_object
.
portal_catalog
(
portal_type
=
"Image"
,
portal_type
=
"Image"
,
language
=
use_language
,
language
=
use_language
,
validation_state
=
validation_state
,
validation_state
=
validation_state
,
reference
=
pass_source_data
reference
=
pass_source_data
))
)
if
not
logo_list
and
use_language
!=
"en"
:
logo_list
=
portal_object
.
portal_catalog
(
portal_type
=
"Image"
,
language
=
"en"
,
validation_state
=
validation_state
,
reference
=
pass_source_data
)
return
populateImageDict
(
logo_list
)
# ------------------------- Product (Website) --------------------------------
# ------------------------- Product (Website) --------------------------------
if
pass_parameter
==
"product"
:
if
pass_parameter
==
"product"
:
...
...
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