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
Mukul
erp5
Commits
aeafe20c
Commit
aeafe20c
authored
Dec 29, 2017
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_web_renderjs_ui] Keep the sort/columns choices when displaying a worklist
parent
d830e69b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
25 deletions
+23
-25
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_worklist_js.js
...eItem/web_page_module/rjs_gadget_erp5_page_worklist_js.js
+1
-1
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_worklist_js.xml
...Item/web_page_module/rjs_gadget_erp5_page_worklist_js.xml
+2
-2
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.js
...TemplateItem/web_page_module/rjs_gadget_erp5_router_js.js
+18
-20
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.xml
...emplateItem/web_page_module/rjs_gadget_erp5_router_js.xml
+2
-2
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_worklist_js.js
View file @
aeafe20c
...
...
@@ -69,7 +69,7 @@
};
}
promise_list
.
push
(
RSVP
.
all
([
gadget
.
getUrlFor
({
command
:
'
display
'
,
options
:
display_options
}),
gadget
.
getUrlFor
({
command
:
'
display
_stored_state
'
,
options
:
display_options
}),
// Remove the counter from the title
action_list
[
i
].
name
,
action_list
[
i
].
count
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_worklist_js.xml
View file @
aeafe20c
...
...
@@ -230,7 +230,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
96
0.57179.36956.61457
</string>
</value>
<value>
<string>
96
3.11788.48702.26146
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -248,7 +248,7 @@
</tuple>
<state>
<tuple>
<float>
15
02119961.78
</float>
<float>
15
14540115.97
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.js
View file @
aeafe20c
...
...
@@ -281,6 +281,23 @@
return
addNavigationHistoryAndDisplay
(
gadget
,
jio_key
,
next_options
);
}
function
calculateChangeOptions
(
previous_options
,
next_options
,
drop_options
)
{
var
key
;
for
(
key
in
previous_options
)
{
if
(
previous_options
.
hasOwnProperty
(
key
))
{
if
(
!
next_options
.
hasOwnProperty
(
key
))
{
next_options
[
key
]
=
previous_options
[
key
];
}
}
}
for
(
key
in
drop_options
)
{
if
(
drop_options
.
hasOwnProperty
(
key
))
{
delete
next_options
[
key
];
}
}
return
next_options
;
}
function
execDisplayStoredStateCommand
(
gadget
,
next_options
)
{
// console.warn(command_options);
var
jio_key
=
next_options
.
jio_key
,
...
...
@@ -290,9 +307,7 @@
if
(
jio_key
)
{
queue
=
gadget
.
props
.
jio_state_gadget
.
get
(
jio_key
)
.
push
(
function
(
options
)
{
// Keep the sticky parameters
copyStickyParameterDict
(
next_options
,
options
);
next_options
=
options
;
calculateChangeOptions
(
options
,
next_options
);
},
function
(
error
)
{
if
((
error
instanceof
jIO
.
util
.
jIOError
)
&&
(
error
.
status_code
===
404
))
{
...
...
@@ -309,23 +324,6 @@
});
}
function
calculateChangeOptions
(
previous_options
,
next_options
,
drop_options
)
{
var
key
;
for
(
key
in
previous_options
)
{
if
(
previous_options
.
hasOwnProperty
(
key
))
{
if
(
!
next_options
.
hasOwnProperty
(
key
))
{
next_options
[
key
]
=
previous_options
[
key
];
}
}
}
for
(
key
in
drop_options
)
{
if
(
drop_options
.
hasOwnProperty
(
key
))
{
delete
next_options
[
key
];
}
}
return
next_options
;
}
function
execChangeCommand
(
previous_options
,
next_options
,
drop_options
)
{
var
options
,
jio_key
;
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.xml
View file @
aeafe20c
...
...
@@ -232,7 +232,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
96
3.65215.25184.4386
</string>
</value>
<value>
<string>
96
4.29820.17700.38587
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -250,7 +250,7 @@
</tuple>
<state>
<tuple>
<float>
151
2733510.73
</float>
<float>
151
4542054.97
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
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