Skip to content

S
slapos.core
Commit 815cdab9 authored by Rafael Monnerat's avatar Rafael Monnerat
Browse files
Options

slapos_jio: Respect frontpage gadget on header links 

    Dont hardcode the slapos gadget everywhere
parent 073fdf6d
Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 80 deletions
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_compute_node_list_js.js
View file @ 815cdab9
......@@ -130,15 +130,14 @@
});
})
.push(function () {
return gadget.updatePanel({
jio_key: "compute_node_module"
});
return gadget.getSetting('frontend_gadget');
})
.push(function () {
.push(function (frontend_gadget) {
return RSVP.all([
gadget.getUrlFor({command: "change", options: {"page": "slap_add_compute_node"}}),
gadget.getUrlFor({command: "change", options: {page: "slap_compute_node_get_token"}}),
gadget.getUrlFor({command: "change", options: {"page": "slapos"}})
gadget.getUrlFor({command: "change", options: {"page": frontend_gadget}}),
gadget.updatePanel({jio_key: "compute_node_module"})
]);
})
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_compute_node_list_js.xml
View file @ 815cdab9
......@@ -236,7 +236,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>1001.20429.28253.1211</string> </value>
<value> <string>1001.26171.19762.42854</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -254,7 +254,7 @@
</tuple>
<state>
<tuple>
<float>1656703797.9</float>
<float>1659041007.85</float>
<string>UTC</string>
</tuple>
</state>
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_invoice_list_js.js
View file @ 815cdab9
......@@ -168,11 +168,6 @@
}
});
})
.push(function () {
return gadget.updatePanel({
jio_key: "accounting_module"
});
})
.push(function () {
return RSVP.all([
gadget.getSetting("hateoas_url"),
......@@ -180,18 +175,22 @@
]);
})
.push(function (url_list) {
return gadget.jio_getAttachment("contract_relative_url",
url_list[0] + url_list[1] + "/Person_getCloudContractRelated?return_json=True");
return RSVP.all([
gadget.jio_getAttachment("contract_relative_url",
url_list[0] + url_list[1] + "/Person_getCloudContractRelated?return_json=True"),
gadget.updatePanel({jio_key: "accounting_module"}),
gadget.getSetting('frontend_gadget')
]);
})
.push(function (contract_relative_url) {
.push(function (result) {
var promise_list = [
gadget.getUrlFor({command: "change", options: {"page": "slapos"}}),
gadget.getUrlFor({command: "change", options: {"page": result[2]}}),
gadget.getUrlFor({command: "change", options: {"page": "slap_rss_ticket",
"jio_key": "accounting_module"}})
];
if (contract_relative_url) {
if (result[0]) {
promise_list.push(
gadget.getUrlFor({command: "change", options: {"jio_key": contract_relative_url,
gadget.getUrlFor({command: "change", options: {"jio_key": result[0],
"page": "slap_controller"}})
);
}
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_invoice_list_js.xml
View file @ 815cdab9
......@@ -236,7 +236,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>992.9642.18182.11008</string> </value>
<value> <string>999.2068.62564.17</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -254,7 +254,7 @@
</tuple>
<state>
<tuple>
<float>1621359340.83</float>
<float>1659042604.5</float>
<string>UTC</string>
</tuple>
</state>
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_network_list_js.js
View file @ 815cdab9
......@@ -123,14 +123,13 @@
});
})
.push(function () {
return gadget.updatePanel({
jio_key: "computer_network_module"
});
return gadget.getSetting('frontend_gadget');
})
.push(function () {
.push(function (frontend_gadget) {
return RSVP.all([
gadget.getUrlFor({command: "change", options: {"page": "slap_add_network"}}),
gadget.getUrlFor({command: "change", options: {"page": "slapos"}})
gadget.getUrlFor({command: "change", options: {"page": frontend_gadget}}),
gadget.updatePanel({jio_key: "computer_network_module"})
]);
})
.push(function (result) {
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_network_list_js.xml
View file @ 815cdab9
......@@ -247,7 +247,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>1000.2322.46712.16657</string> </value>
<value> <string>1001.26171.19762.42854</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -265,7 +265,7 @@
</tuple>
<state>
<tuple>
<float>1656703774.51</float>
<float>1659040536.73</float>
<string>UTC</string>
</tuple>
</state>
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_person_view_js.js
View file @ 815cdab9
......@@ -307,23 +307,22 @@
});
})
.push(function () {
return gadget.updatePanel({
jio_key: "person_module"
});
})
.push(function () {
return window.getSettingMe(gadget);
return RSVP.all([
window.getSettingMe(gadget),
gadget.getSetting('frontend_gadget')
]);
})
.push(function (me) {
.push(function (setting_list) {
return RSVP.all([
gadget.getUrlFor({command: "change", options: {editable: true}}),
gadget.getUrlFor({command: "change", options: {jio_key: me, page: "slap_person_revoke_certificate"}}),
gadget.getUrlFor({command: "change", options: {jio_key: me, page: "slap_person_request_certificate"}}),
gadget.getUrlFor({command: "change", options: {jio_key: me, page: "slap_person_get_token"}}),
gadget.getUrlFor({command: "change", options: {jio_key: me, page: "slap_person_add_erp5_login"}}),
gadget.getUrlFor({command: "change", options: {jio_key: me, page: "slap_person_add_organisation"}}),
gadget.getUrlFor({command: "change", options: {page: "slapos"}}),
gadget.getUrlFor({command: "change", options: {jio_key: gadget.state.doc.contract_relative_url, page: "slap_controller"}})
gadget.getUrlFor({command: "change", options: {jio_key: setting_list[0], page: "slap_person_revoke_certificate"}}),
gadget.getUrlFor({command: "change", options: {jio_key: setting_list[0], page: "slap_person_request_certificate"}}),
gadget.getUrlFor({command: "change", options: {jio_key: setting_list[0], page: "slap_person_get_token"}}),
gadget.getUrlFor({command: "change", options: {jio_key: setting_list[0], page: "slap_person_add_erp5_login"}}),
gadget.getUrlFor({command: "change", options: {jio_key: setting_list[0], page: "slap_person_add_organisation"}}),
gadget.getUrlFor({command: "change", options: {page: setting_list[1]}}),
gadget.getUrlFor({command: "change", options: {jio_key: gadget.state.doc.contract_relative_url, page: "slap_controller"}}),
gadget.updatePanel({jio_key: "person_module"})
]);
})
.push(function (result) {
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_person_view_js.xml
View file @ 815cdab9
......@@ -245,7 +245,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>987.49476.87.8891</string> </value>
<value> <string>999.2068.62564.17</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -263,7 +263,7 @@
</tuple>
<state>
<tuple>
<float>1621547040.59</float>
<float>1659043287.11</float>
<string>UTC</string>
</tuple>
</state>
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_project_list_js.js
View file @ 815cdab9
......@@ -84,14 +84,13 @@
});
})
.push(function () {
return gadget.updatePanel({
jio_key: "project_module"
});
return gadget.getSetting('frontend_gadget');
})
.push(function () {
.push(function (frontend_gadget) {
return RSVP.all([
gadget.getUrlFor({command: "change", options: {"page": "slap_add_project"}}),
gadget.getUrlFor({command: "change", options: {"page": "slapos"}})
gadget.getUrlFor({command: "change", options: {"page": frontend_gadget}}),
gadget.updatePanel({jio_key: "project_module"})
]);
})
.push(function (result) {
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_project_list_js.xml
View file @ 815cdab9
......@@ -236,7 +236,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>1000.2322.46712.16657</string> </value>
<value> <string>1001.26171.19762.42854</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -254,7 +254,7 @@
</tuple>
<state>
<tuple>
<float>1656975508.53</float>
<float>1659040330.61</float>
<string>UTC</string>
</tuple>
</state>
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_service_list_js.js
View file @ 815cdab9
......@@ -87,15 +87,13 @@
});
})
.push(function () {
return gadget.updatePanel({
jio_key: "instance_tree_module"
});
return gadget.getSetting('frontend_gadget');
})
.push(function () {
.push(function (frontend_gadget) {
return RSVP.all([
gadget.getUrlFor({command: "display_dialog_with_history", options: {"page": "slap_select_software_product"}}),
gadget.getUrlFor({command: "change", options: {"page": "slapos"}})
gadget.getUrlFor({command: "change", options: {"page": frontend_gadget}}),
gadget.updatePanel({jio_key: "instance_tree_module"})
]);
})
.push(function (result) {
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_service_list_js.xml
View file @ 815cdab9
......@@ -236,7 +236,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>999.2068.62564.17</string> </value>
<value> <string>1001.26171.19762.42854</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -254,7 +254,7 @@
</tuple>
<state>
<tuple>
<float>1655115655.51</float>
<float>1659041088.19</float>
<string>UTC</string>
</tuple>
</state>
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_site_list_js.js
View file @ 815cdab9
......@@ -147,17 +147,16 @@
});
})
.push(function () {
return gadget.updatePanel({
jio_key: 'organisation_module'
});
return gadget.getSetting('frontend_gadget');
})
.push(function () {
.push(function (frontend_gadget) {
return RSVP.all([
gadget.getUrlFor({
command: 'change',
options: { page: 'slap_add_organisation' }
}),
gadget.getUrlFor({ command: 'change', options: { page: 'slapos' } })
gadget.getUrlFor({ command: 'change', options: { page: frontend_gadget}}),
gadget.updatePanel({jio_key: 'organisation_module'})
]);
})
.push(function (result) {
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_site_list_js.xml
View file @ 815cdab9
......@@ -236,7 +236,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>999.2068.62564.17</string> </value>
<value> <string>1001.59382.44188.28893</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -254,7 +254,7 @@
</tuple>
<state>
<tuple>
<float>1656975585.67</float>
<float>1659040946.32</float>
<string>UTC</string>
</tuple>
</state>
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_ticket_list_js.js
View file @ 815cdab9
......@@ -96,16 +96,15 @@
});
})
.push(function () {
return gadget.updatePanel({
jio_key: "support_request_module"
});
return gadget.getSetting('frontend_gadget');
})
.push(function () {
.push(function (frontend_gadget) {
return RSVP.all([
gadget.getUrlFor({command: "change", options: {"page": "slap_add_ticket"}}),
gadget.getUrlFor({command: "change", options: {"page": "slap_rss_ticket"}}),
gadget.getUrlFor({command: "change", options: {"page": "slapos"}}),
gadget.getUrlFor({command: "change", options: {"page": "slap_rss_critical_ticket"}})
gadget.getUrlFor({command: "change", options: {"page": frontend_gadget}}),
gadget.getUrlFor({command: "change", options: {"page": "slap_rss_critical_ticket"}}),
gadget.updatePanel({jio_key: "support_request_module"})
]);
})
.push(function (result) {
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_ticket_list_js.xml
View file @ 815cdab9
......@@ -236,7 +236,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>982.32417.7827.45414</string> </value>
<value> <string>1000.2322.46712.16657</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -254,7 +254,7 @@
</tuple>
<state>
<tuple>
<float>1584094338.1</float>
<float>1659040420.38</float>
<string>UTC</string>
</tuple>
</state>
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slapos_js.js
View file @ 815cdab9
......@@ -324,13 +324,18 @@
});
})
.push(function () {
return gadget.updatePanel({
jio_key: false
});
return gadget.getSetting('frontend_gadget');
})
.push(function () {
.push(function (frontend_gadget) {
return RSVP.all([
gadget.getUrlFor({command: "change", options: {"page": frontend_gadget}}),
gadget.updatePanel({jio_key: false})
]);
})
.push(function (url_list) {
return gadget.updateHeader({
page_title: gadget.page_title_translation
page_title: gadget.page_title_translation,
selection_url: url_list[0]
});
});
})
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slapos_js.xml
View file @ 815cdab9
......@@ -247,7 +247,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>1000.49358.14576.324</string> </value>
<value> <string>1001.26171.19762.42854</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -265,7 +265,7 @@
</tuple>
<state>
<tuple>
<float>1656976814.1</float>
<float>1659041395.54</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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7