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
Amer
erp5
Commits
85d86da5
Commit
85d86da5
authored
Nov 19, 2018
by
Aurel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
prevent multiple conversion with renderSimpleView too + minors fixes
parent
918f4740
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
4 deletions
+9
-4
bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style_core/Base_renderSimpleView.py
...l_skins/erp5_deferred_style_core/Base_renderSimpleView.py
+6
-1
bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style_core/ERP5Site_notifyReportComplete.xml
...rp5_deferred_style_core/ERP5Site_notifyReportComplete.xml
+1
-1
bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style_core/SystemPreference_viewDeferredStyle.xml
...eferred_style_core/SystemPreference_viewDeferredStyle.xml
+1
-1
bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style_core/SystemPreference_viewDeferredStyle/my_preferred_deferred_report_stored_as_document.xml
...Style/my_preferred_deferred_report_stored_as_document.xml
+1
-1
No files found.
bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style_core/Base_renderSimpleView.py
View file @
85d86da5
...
@@ -2,6 +2,10 @@
...
@@ -2,6 +2,10 @@
from
Products.ERP5Type.Message
import
translateString
from
Products.ERP5Type.Message
import
translateString
portal
=
context
.
getPortalObject
()
portal
=
context
.
getPortalObject
()
request
=
portal
.
REQUEST
request
=
portal
.
REQUEST
report_format
=
request_form
[
'format'
]
if
portal
.
portal_preferences
.
getPreferredDeferredReportStoredAsDocument
():
request_form
[
'format'
]
=
None
request
.
form
.
update
(
request_form
)
request
.
form
.
update
(
request_form
)
if
skin_name
and
skin_name
!=
'None'
:
# make_query serializes None as 'None'
if
skin_name
and
skin_name
!=
'None'
:
# make_query serializes None as 'None'
...
@@ -31,4 +35,5 @@ with portal.Localizer.translationContext(localizer_language):
...
@@ -31,4 +35,5 @@ with portal.Localizer.translationContext(localizer_language):
user_name
=
user_name
,
user_name
=
user_name
,
subject
=
str
(
translateString
(
attachment_name
.
rsplit
(
'.'
,
1
)[
0
])),
subject
=
str
(
translateString
(
attachment_name
.
rsplit
(
'.'
,
1
)[
0
])),
message
=
''
,
message
=
''
,
attachment_list
=
attachment_list
)
attachment_list
=
attachment_list
,
format
=
report_format
)
bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style_core/ERP5Site_notifyReportComplete.xml
View file @
85d86da5
...
@@ -50,7 +50,7 @@
...
@@ -50,7 +50,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
_params
</string>
</key>
<key>
<string>
_params
</string>
</key>
<value>
<string>
user_name, subject, message, attachment_list, format=
None
</string>
</value>
<value>
<string>
user_name, subject, message, attachment_list, format=
""
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
_proxy_roles
</string>
</key>
<key>
<string>
_proxy_roles
</string>
</key>
...
...
bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style_core/SystemPreference_viewDeferredStyle.xml
View file @
85d86da5
...
@@ -114,7 +114,7 @@
...
@@ -114,7 +114,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
title
</string>
</key>
<key>
<string>
title
</string>
</key>
<value>
<string>
Deferred Style
Preferences
</string>
</value>
<value>
<string>
Deferred Style
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
unicode_mode
</string>
</key>
<key>
<string>
unicode_mode
</string>
</key>
...
...
bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style_core/SystemPreference_viewDeferredStyle/my_preferred_deferred_report_stored_as_document.xml
View file @
85d86da5
...
@@ -73,7 +73,7 @@
...
@@ -73,7 +73,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
title
</string>
</key>
<key>
<string>
title
</string>
</key>
<value>
<string>
Deferred Report Stored
A
s Document
</string>
</value>
<value>
<string>
Deferred Report Stored
a
s Document
</string>
</value>
</item>
</item>
</dictionary>
</dictionary>
</value>
</value>
...
...
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