Commit 3681e745 authored by Thomas Gambier's avatar Thomas Gambier 🚴🏼 Committed by Rafael Monnerat

slapos_jio: fix previous button when adding a new service

parent 69824c39
......@@ -161,14 +161,13 @@
})
.push(function () {
return RSVP.all([
gadget.getUrlFor({command: 'change', options: {page: "slap_select_software_release"}})
gadget.getUrlFor({command: 'cancel_dialog_with_history'})
]);
})
.push(function (url_list) {
return gadget.updateHeader({
page_title: "Request Service: " + doc.title,
selection_url: url_list[0],
submit_action: true
page_title: "3/3 Request Service: " + doc.title,
cancel_url: url_list[0]
});
});
});
......
......@@ -273,7 +273,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>975.59432.24638.52206</string> </value>
<value> <string>975.59425.10278.53248</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -291,7 +291,7 @@
</tuple>
<state>
<tuple>
<float>1558622071.93</float>
<float>1558621547.86</float>
<string>UTC</string>
</tuple>
</state>
......
......@@ -17,7 +17,7 @@
var index, param_list, gadget = this;
for (index in promise_list[0]) {
if ((promise_list[0][index].command === "index") && (promise_list[0][index].options.jio_key) &&
if ((promise_list[0][index].command === "display_with_history_and_cancel") && (promise_list[0][index].options.jio_key) &&
(promise_list[0][index].options.jio_key.startsWith("software_product_module"))) {
promise_list[0][index].options.page = "slap_select_software_release";
if (gadget.computer_jio_key !== undefined) {
......@@ -63,6 +63,7 @@
erp5_document: {
"_embedded": {"_view": {
"listbox": {
"command": 'display_with_history_and_cancel',
"column_list": column_list,
"show_anchor": 0,
"default_params": {},
......@@ -98,13 +99,13 @@
})
.push(function () {
return RSVP.all([
gadget.getUrlFor({command: 'change', options: {"page": "slap_controller"}})
gadget.getUrlFor({command: 'cancel_dialog_with_history'})
]);
})
.push(function (url_list) {
return gadget.updateHeader({
page_title: "Select one Software",
selection_url: url_list[0],
page_title: "1/3 Select one Software",
cancel_url: url_list[0],
filter_action: true
});
});
......
......@@ -230,7 +230,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>972.37756.33633.30481</string> </value>
<value> <string>975.59381.43838.41676</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -248,7 +248,7 @@
</tuple>
<state>
<tuple>
<float>1545870712.4</float>
<float>1558620300.85</float>
<string>UTC</string>
</tuple>
</state>
......
......@@ -19,7 +19,7 @@
var index, param_list, gadget = this;
for (index in promise_list[0]) {
if ((promise_list[0][index].command === "index") && (promise_list[0][index].options.jio_key) &&
if ((promise_list[0][index].command === "display_with_history_and_cancel") && (promise_list[0][index].options.jio_key) &&
(promise_list[0][index].options.jio_key.startsWith("software_release_module"))) {
if (gadget.computer_jio_key !== undefined) {
promise_list[0][index].options.page = "slap_add_software_installation";
......@@ -63,6 +63,7 @@
erp5_document: {
"_embedded": {"_view": {
"listbox": {
"command": 'display_with_history_and_cancel',
"column_list": column_list,
"show_anchor": 0,
"default_params": {},
......@@ -108,13 +109,13 @@
})
.push(function () {
return RSVP.all([
gadget.getUrlFor({command: 'change', options: {"page": "slap_select_software_product"}})
gadget.getUrlFor({command: 'cancel_dialog_with_history'})
]);
})
.push(function (url_list) {
return gadget.updateHeader({
page_title: "Select one Release",
selection_url: url_list[0],
page_title: "2/3 Select one Release",
cancel_url: url_list[0],
filter_action: true
});
});
......
......@@ -230,7 +230,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>972.37768.39754.62054</string> </value>
<value> <string>975.59386.30547.51490</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -248,7 +248,7 @@
</tuple>
<state>
<tuple>
<float>1545871468.02</float>
<float>1558620295.79</float>
<string>UTC</string>
</tuple>
</state>
......
......@@ -119,7 +119,7 @@
})
.push(function (result) {
return RSVP.all([
gadget.getUrlFor({command: "change", options: {"page": "slap_select_software_product"}}),
gadget.getUrlFor({command: "display_dialog_with_history", options: {"page": "slap_select_software_product"}}),
gadget.getUrlFor({command: "change", options: {"page": "slapos"}})
]);
......
......@@ -230,7 +230,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>974.61501.898.16708</string> </value>
<value> <string>975.58079.59045.43946</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -248,7 +248,7 @@
</tuple>
<state>
<tuple>
<float>1554900916.8</float>
<float>1558616829.7</float>
<string>UTC</string>
</tuple>
</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