Commit ee38ba9d authored by Romain Courteaud's avatar Romain Courteaud

WIP erp5_web_renderjs_ui: allow to jump to the same context

parent 9747beb6
...@@ -40,25 +40,34 @@ ...@@ -40,25 +40,34 @@
return; return;
} }
if (gadget.state.jio_key === result.jio_key) { if (gadget.state.jio_key === result.jio_key) {
// don't update navigation history when not really redirecting if ((!result.view) || (result.view === 'view')) {
return gadget.redirect({command: 'cancel_dialog_with_history'}); // Do not redirect to a specific view
} // It may probably mean that there is no document to jump to
// don't update navigation history when not really redirecting
splitted_jio_key_list = result.jio_key.split('/'); command = 'cancel_dialog_with_history';
if (splitted_jio_key_list.length < 2) { } else {
// When going to a module, stick to the current document context, command = 'display_with_history';
// ie, display current document panel/header, but display the module form_list result_dict.jio_key = gadget.state.jio_key;
// This is implemented by the page "jump" result_dict.view = result.view;
command = 'display_with_history'; result_dict.page = "jump";
result_dict.jio_key = gadget.state.jio_key; }
result_dict.view = result.view;
result_dict.page = "jump";
} else { } else {
command = 'push_history';
result_dict.jio_key = result.jio_key;
result_dict.view = result.view;
}
splitted_jio_key_list = result.jio_key.split('/');
if (splitted_jio_key_list.length < 2) {
// When going to a module, stick to the current document context,
// ie, display current document panel/header, but display the module form_list
// This is implemented by the page "jump"
command = 'display_with_history';
result_dict.jio_key = gadget.state.jio_key;
result_dict.view = result.view;
result_dict.page = "jump";
} else {
command = 'push_history';
result_dict.jio_key = result.jio_key;
result_dict.view = result.view;
}
}
// forced document change thus we update history // forced document change thus we update history
return gadget.redirect({ return gadget.redirect({
......
...@@ -234,7 +234,7 @@ ...@@ -234,7 +234,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>981.337.64021.48674</string> </value> <value> <string>985.40438.63970.10154</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -252,7 +252,7 @@ ...@@ -252,7 +252,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1578410060.49</float> <float>1596199151.01</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment