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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
francois
erp5
Commits
8eecfcac
Commit
8eecfcac
authored
May 31, 2017
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_xhtml_style] handle object_exchange_jio as object_exchange action_type
parent
254fa017
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
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
+3
-2
No files found.
product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_fixDialogActions.py
View file @
8eecfcac
...
@@ -5,6 +5,8 @@ from Products.PythonScripts.standard import url_quote
...
@@ -5,6 +5,8 @@ from Products.PythonScripts.standard import url_quote
if
dialog_category
==
'object_report'
:
if
dialog_category
==
'object_report'
:
return
sorted
(
actions
.
get
(
'object_report'
,
[])
+
actions
.
get
(
'object_report_jio'
,
[]),
key
=
lambda
x
:
x
[
"priority"
])
return
sorted
(
actions
.
get
(
'object_report'
,
[])
+
actions
.
get
(
'object_report_jio'
,
[]),
key
=
lambda
x
:
x
[
"priority"
])
elif
dialog_category
==
'object_exchange'
:
return
sorted
(
actions
.
get
(
'object_exchange'
,
[])
+
actions
.
get
(
'object_exchange_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 @
8eecfcac
...
@@ -101,6 +101,7 @@
...
@@ -101,6 +101,7 @@
<span class="first"
<span class="first"
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;
exchange_jio_actions actions/object_exchange_jio | nothing;
report_actions actions/object_report | nothing;
report_actions actions/object_report | nothing;
report_jio_actions actions/object_report_jio | nothing;
report_jio_actions actions/object_report_jio | nothing;
button_actions actions/object_button | nothing;
button_actions actions/object_button | nothing;
...
@@ -213,9 +214,9 @@
...
@@ -213,9 +214,9 @@
<span class="description" i18n:translate="" i18n:domain="ui">Sort</span>
<span class="description" i18n:translate="" i18n:domain="ui">Sort</span>
</a>
</a>
</tal:block>
</tal:block>
<span tal:condition="exchange_actions | report_actions"
<span tal:condition="exchange_actions |
exchange_jio_actions |
report_actions"
class="separator"><!--separator--></span>
class="separator"><!--separator--></span>
<button tal:condition="exchange_actions" class="import_export"
<button tal:condition="exchange_actions
| exchange_jio_actions
" class="import_export"
type="submit" name="Base_doExchange:method" title="Import / Export"
type="submit" name="Base_doExchange:method" title="Import / Export"
i18n:attributes="title" i18n:domain="ui">
i18n:attributes="title" i18n:domain="ui">
<span class="image"></span>
<span class="image"></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