Commit 1a1bc533 authored by Rafael Monnerat's avatar Rafael Monnerat

slapos_jio: Return to the module if the user wants to return (selection_url)

parent aba9d905
...@@ -155,11 +155,14 @@ ...@@ -155,11 +155,14 @@
}); });
}) })
.push(function () { .push(function () {
return gadget.getSetting('document_title'); return RSVP.all([
gadget.getUrlFor({command: 'change', options: {page: "slap_computer_list"}})
]);
}) })
.push(function (document_title) { .push(function (url_list) {
return gadget.updateHeader({ return gadget.updateHeader({
page_title: "New Computer", page_title: "New Computer",
selection_url: url_list[0],
submit_action: true submit_action: true
}); });
}); });
......
...@@ -273,7 +273,7 @@ ...@@ -273,7 +273,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>963.11842.54505.65501</string> </value> <value> <string>966.48704.22248.60467</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -291,7 +291,7 @@ ...@@ -291,7 +291,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1523033988.86</float> <float>1523286392.39</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -110,8 +110,14 @@ ...@@ -110,8 +110,14 @@
}); });
}) })
.push(function () { .push(function () {
return RSVP.all([
gadget.getUrlFor({command: 'change', options: {page: "slap_network_list"}})
]);
})
.push(function (url_list) {
return gadget.updateHeader({ return gadget.updateHeader({
page_title: "New Network", page_title: "New Network",
selection_url: url_list[0],
submit_action: true submit_action: true
}); });
}); });
......
...@@ -273,7 +273,7 @@ ...@@ -273,7 +273,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>963.7802.51679.16059</string> </value> <value> <string>966.48705.14270.63044</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -291,7 +291,7 @@ ...@@ -291,7 +291,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1523033974.84</float> <float>1523284357.6</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -131,12 +131,13 @@ ...@@ -131,12 +131,13 @@
}) })
.push(function (result) { .push(function (result) {
return RSVP.all([ return RSVP.all([
gadget.getUrlFor({command: "change", options: {"page": "slap_add_organisation"}}) gadget.getUrlFor({command: 'change', options: {page: "slap_site_list"}})
]); ]);
}) })
.push(function () { .push(function (url_list) {
return gadget.updateHeader({ return gadget.updateHeader({
page_title: "New Organisation", page_title: "New Site",
selection_url: url_list[0],
submit_action: true submit_action: true
}); });
}); });
......
...@@ -284,7 +284,7 @@ ...@@ -284,7 +284,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>966.41526.6603.40089</string> </value> <value> <string>966.44603.20243.21469</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -302,7 +302,7 @@ ...@@ -302,7 +302,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1523033958.49</float> <float>1523284444.13</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -172,9 +172,15 @@ ...@@ -172,9 +172,15 @@
} }
}); });
}) })
.push(function () { .push(function () {
return RSVP.all([
gadget.getUrlFor({command: 'history_previous'})
]);
})
.push(function (url_list) {
return gadget.updateHeader({ return gadget.updateHeader({
page_title: "New Message", page_title: "New Message",
selection_url: url_list[0],
submit_action: true submit_action: true
}); });
}); });
......
...@@ -39,6 +39,17 @@ ...@@ -39,6 +39,17 @@
</tuple> </tuple>
</value> </value>
</item> </item>
<item>
<key> <string>_Copy_or_Move_Permission</string> </key>
<value>
<list>
<string>Manager</string>
<string>Authenticated</string>
<string>Developer</string>
<string>Owner</string>
</list>
</value>
</item>
<item> <item>
<key> <string>_Modify_portal_content_Permission</string> </key> <key> <string>_Modify_portal_content_Permission</string> </key>
<value> <value>
...@@ -273,7 +284,7 @@ ...@@ -273,7 +284,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>965.59722.26989.42052</string> </value> <value> <string>966.41526.6603.40089</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -291,7 +302,7 @@ ...@@ -291,7 +302,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1520009407.21</float> <float>1523280068.08</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