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
alecs_myu
erp5
Commits
87a6aa69
Commit
87a6aa69
authored
Apr 04, 2017
by
Tristan Cavelier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_xhtml_style: handle object_report_jio as object_report action_type
parent
8ea76b33
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_fixDialogActions.py
...em/portal_skins/erp5_xhtml_style/Base_fixDialogActions.py
+2
-0
product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/context_box_render.zpt
...Item/portal_skins/erp5_xhtml_style/context_box_render.zpt
+2
-1
No files found.
product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_fixDialogActions.py
View file @
87a6aa69
...
@@ -3,6 +3,8 @@ actions that does not provide one.
...
@@ -3,6 +3,8 @@ actions that does not provide one.
"""
"""
from
Products.PythonScripts.standard
import
url_quote
from
Products.PythonScripts.standard
import
url_quote
if
dialog_category
==
'object_report'
:
return
sorted
(
actions
.
get
(
'object_report'
,
[])
+
actions
.
get
(
'object_report_jio'
,
[]),
key
=
lambda
x
:
x
[
"priority"
])
if
dialog_category
!=
'object_print'
:
if
dialog_category
!=
'object_print'
:
return
actions
.
get
(
dialog_category
,
[])
return
actions
.
get
(
dialog_category
,
[])
...
...
product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/context_box_render.zpt
View file @
87a6aa69
...
@@ -102,6 +102,7 @@
...
@@ -102,6 +102,7 @@
tal:define="search_actions actions/object_search | nothing;
tal:define="search_actions actions/object_search | nothing;
exchange_actions actions/object_exchange | nothing;
exchange_actions actions/object_exchange | nothing;
report_actions actions/object_report | nothing;
report_actions actions/object_report | nothing;
report_jio_actions actions/object_report_jio | nothing;
button_actions actions/object_button | nothing;
button_actions actions/object_button | nothing;
fast_input_actions actions/object_fast_input | nothing;
fast_input_actions actions/object_fast_input | nothing;
sort_actions actions/object_sort | nothing;
sort_actions actions/object_sort | nothing;
...
@@ -220,7 +221,7 @@
...
@@ -220,7 +221,7 @@
<span class="image"></span>
<span class="image"></span>
<span class="description" i18n:translate="" i18n:domain="ui">Import / Export</span>
<span class="description" i18n:translate="" i18n:domain="ui">Import / Export</span>
</button>
</button>
<button tal:condition="report_actions" class="report" type="submit" name="Base_doReport:method" title="Report"
<button tal:condition="report_actions
| report_jio_actions
" class="report" type="submit" name="Base_doReport:method" title="Report"
i18n:attributes="title" i18n:domain="ui">
i18n:attributes="title" i18n:domain="ui">
<span class="image"></span>
<span class="image"></span>
<span class="description" i18n:translate="" i18n:domain="ui">Report</span>
<span class="description" i18n:translate="" i18n:domain="ui">Report</span>
...
...
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