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
139
Merge Requests
139
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
Jobs
Commits
Open sidebar
nexedi
erp5
Commits
226cedcb
Commit
226cedcb
authored
Jan 18, 2017
by
Tristan Cavelier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_web: fix use wrong convert cache key (force str format_kw values)
obj.convert(format="png") != obj.convert(format=u"png")
parent
b54b55dd
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/Base_convertHtmlToSingleFile.py
...tem/portal_skins/erp5_web/Base_convertHtmlToSingleFile.py
+2
-2
No files found.
bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/Base_convertHtmlToSingleFile.py
View file @
226cedcb
...
@@ -167,10 +167,10 @@ def handleImageSourceObject(obj, src):
...
@@ -167,10 +167,10 @@ def handleImageSourceObject(obj, src):
format_kw
=
{}
format_kw
=
{}
for
key
,
value
in
search
:
for
key
,
value
in
search
:
if
key
==
"format"
and
value
is
not
None
:
if
key
==
"format"
and
value
is
not
None
:
format_kw
[
"format"
]
=
value
format_kw
[
"format"
]
=
str
(
value
)
elif
key
==
"display"
and
value
is
not
None
:
elif
key
==
"display"
and
value
is
not
None
:
format_kw
.
setdefault
(
"format"
,
""
)
format_kw
.
setdefault
(
"format"
,
""
)
format_kw
[
"display"
]
=
value
format_kw
[
"display"
]
=
str
(
value
)
if
format_kw
:
if
format_kw
:
mime
,
data
=
obj
.
convert
(
**
format_kw
)
mime
,
data
=
obj
.
convert
(
**
format_kw
)
return
handleLinkedData
(
mime
,
str
(
data
),
src
)
return
handleLinkedData
(
mime
,
str
(
data
),
src
)
...
...
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