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
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Romain Courteaud
erp5
Commits
2a4569af
Commit
2a4569af
authored
Jun 06, 2019
by
Romain Courteaud
🐸
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_web_renderjs_ui] Reset the sort parameter when accessing a worklist
parent
64b98991
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
7 deletions
+10
-7
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
+3
-0
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
+3
-3
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 @
2a4569af
...
@@ -71,6 +71,9 @@
...
@@ -71,6 +71,9 @@
page
:
'
search
'
page
:
'
search
'
};
};
}
}
// HARDCODED: most erp5's module listboxes are named 'listbox'
// Drop the sort parameter, to speed up the calculation
display_options
[
'
field_listbox_sort_list:json
'
]
=
undefined
;
url_for_parameter_list
.
push
(
url_for_parameter_list
.
push
(
{
command
:
'
display_stored_state
'
,
options
:
display_options
}
{
command
:
'
display_stored_state
'
,
options
:
display_options
}
);
);
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_worklist_js.xml
View file @
2a4569af
...
@@ -228,7 +228,7 @@
...
@@ -228,7 +228,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
9
68.45482.36373.28842
</string>
</value>
<value>
<string>
9
76.13725.50121.7014
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -246,7 +246,7 @@
...
@@ -246,7 +246,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
15
36227336.81
</float>
<float>
15
59812175.93
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.js
View file @
2a4569af
...
@@ -345,7 +345,7 @@
...
@@ -345,7 +345,7 @@
return
next_options
;
return
next_options
;
}
}
function
execDisplayStoredStateCommand
(
gadget
,
next_options
)
{
function
execDisplayStoredStateCommand
(
gadget
,
next_options
,
drop_options
)
{
// console.warn(command_options);
// console.warn(command_options);
var
jio_key
=
next_options
.
jio_key
,
var
jio_key
=
next_options
.
jio_key
,
storage_key
=
jio_key
,
storage_key
=
jio_key
,
...
@@ -359,7 +359,7 @@
...
@@ -359,7 +359,7 @@
if
(
storage_key
)
{
if
(
storage_key
)
{
queue
=
gadget
.
props
.
jio_state_gadget
.
get
(
storage_key
)
queue
=
gadget
.
props
.
jio_state_gadget
.
get
(
storage_key
)
.
push
(
function
(
options
)
{
.
push
(
function
(
options
)
{
calculateChangeOptions
(
options
,
next_options
);
calculateChangeOptions
(
options
,
next_options
,
drop_options
);
},
function
(
error
)
{
},
function
(
error
)
{
if
((
error
instanceof
jIO
.
util
.
jIOError
)
&&
if
((
error
instanceof
jIO
.
util
.
jIOError
)
&&
(
error
.
status_code
===
404
))
{
(
error
.
status_code
===
404
))
{
...
@@ -883,7 +883,7 @@
...
@@ -883,7 +883,7 @@
return
execKeepHistoryAndCancelDialogCommand
(
gadget
,
previous_options
);
return
execKeepHistoryAndCancelDialogCommand
(
gadget
,
previous_options
);
}
}
if
(
command_options
.
path
===
COMMAND_DISPLAY_STORED_STATE
)
{
if
(
command_options
.
path
===
COMMAND_DISPLAY_STORED_STATE
)
{
return
execDisplayStoredStateCommand
(
gadget
,
next_options
);
return
execDisplayStoredStateCommand
(
gadget
,
next_options
,
drop_options
);
}
}
if
(
command_options
.
path
===
COMMAND_INDEX_STATE
)
{
if
(
command_options
.
path
===
COMMAND_INDEX_STATE
)
{
return
execIndexCommand
(
gadget
,
previous_options
,
next_options
);
return
execIndexCommand
(
gadget
,
previous_options
,
next_options
);
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_router_js.xml
View file @
2a4569af
...
@@ -230,7 +230,7 @@
...
@@ -230,7 +230,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
97
2.58906.44395.1235
6
</string>
</value>
<value>
<string>
97
6.13727.43454.822
6
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -248,7 +248,7 @@
...
@@ -248,7 +248,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
15
47217993.21
</float>
<float>
15
59811855.94
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</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