Commit 287135bb authored by Cédric Le Ninivin's avatar Cédric Le Ninivin

slapos_jio: update hardcoded front page

parent 73f02ed4
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
return RSVP.all([ return RSVP.all([
gadget.getUrlFor({command: "change", options: {"page": "slap_add_compute_node"}}), 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: "slap_compute_node_get_token"}}),
gadget.getUrlFor({command: "change", options: {"page": "slapos"}}) gadget.getUrlFor({command: "change", options: {"page": "slap_service_list"}})
]); ]);
}) })
......
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
return gadget.getUrlFor({ return gadget.getUrlFor({
command: 'display', command: 'display',
absolute_url: true, absolute_url: true,
options: {"jio_key": "/", "page": "slapos"} options: {"jio_key": "/", "page": "slap_service_list"}
}) })
}) })
.push(function (came_from) { .push(function (came_from) {
......
...@@ -185,7 +185,7 @@ ...@@ -185,7 +185,7 @@
}) })
.push(function (contract_relative_url) { .push(function (contract_relative_url) {
var promise_list = [ var promise_list = [
gadget.getUrlFor({command: "change", options: {"page": "slapos"}}), gadget.getUrlFor({command: "change", options: {"page": "slap_service_list"}}),
gadget.getUrlFor({command: "change", options: {"page": "slap_rss_ticket", gadget.getUrlFor({command: "change", options: {"page": "slap_rss_ticket",
"jio_key": "accounting_module"}}) "jio_key": "accounting_module"}})
]; ];
......
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
.push(function () { .push(function () {
return RSVP.all([ return RSVP.all([
gadget.getUrlFor({command: "change", options: {"page": "slap_add_network"}}), gadget.getUrlFor({command: "change", options: {"page": "slap_add_network"}}),
gadget.getUrlFor({command: "change", options: {"page": "slapos"}}) gadget.getUrlFor({command: "change", options: {"page": "slap_service_list"}})
]); ]);
}) })
.push(function (result) { .push(function (result) {
......
...@@ -322,7 +322,7 @@ ...@@ -322,7 +322,7 @@
gadget.getUrlFor({command: "change", options: {jio_key: me, page: "slap_person_get_token"}}), 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_erp5_login"}}),
gadget.getUrlFor({command: "change", options: {jio_key: me, page: "slap_person_add_organisation"}}), 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: {page: "slap_service_list"}}),
gadget.getUrlFor({command: "change", options: {jio_key: gadget.state.doc.contract_relative_url, page: "slap_controller"}}) gadget.getUrlFor({command: "change", options: {jio_key: gadget.state.doc.contract_relative_url, page: "slap_controller"}})
]); ]);
}) })
......
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
.push(function () { .push(function () {
return RSVP.all([ return RSVP.all([
gadget.getUrlFor({command: "change", options: {"page": "slap_add_project"}}), gadget.getUrlFor({command: "change", options: {"page": "slap_add_project"}}),
gadget.getUrlFor({command: "change", options: {"page": "slapos"}}) gadget.getUrlFor({command: "change", options: {"page": "slap_service_list"}})
]); ]);
}) })
.push(function (result) { .push(function (result) {
......
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
.push(function () { .push(function () {
return RSVP.all([ return RSVP.all([
gadget.getUrlFor({command: "display_dialog_with_history", 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"}}) gadget.getUrlFor({command: "change", options: {"page": "slap_service_list"}})
]); ]);
}) })
......
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
command: 'change', command: 'change',
options: { page: 'slap_add_organisation' } options: { page: 'slap_add_organisation' }
}), }),
gadget.getUrlFor({ command: 'change', options: { page: 'slapos' } }) gadget.getUrlFor({ command: 'change', options: { page: 'slap_service_list' } })
]); ]);
}) })
.push(function (result) { .push(function (result) {
......
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
return RSVP.all([ return RSVP.all([
gadget.getUrlFor({command: "change", options: {"page": "slap_add_ticket"}}), gadget.getUrlFor({command: "change", options: {"page": "slap_add_ticket"}}),
gadget.getUrlFor({command: "change", options: {"page": "slap_rss_ticket"}}), gadget.getUrlFor({command: "change", options: {"page": "slap_rss_ticket"}}),
gadget.getUrlFor({command: "change", options: {"page": "slapos"}}), gadget.getUrlFor({command: "change", options: {"page": "slap_service_list"}}),
gadget.getUrlFor({command: "change", options: {"page": "slap_rss_critical_ticket"}}) gadget.getUrlFor({command: "change", options: {"page": "slap_rss_critical_ticket"}})
]); ]);
}) })
......
...@@ -6,7 +6,8 @@ portal = context.getPortalObject() ...@@ -6,7 +6,8 @@ portal = context.getPortalObject()
assert key assert key
mail_message = portal.ERP5Site_unrestrictedSearchMessage(key=key) mail_message = portal.ERP5Site_unrestrictedSearchMessage(key=key)
came_from = context.getWebSiteValue().absolute_url() + "/#!login?p.page=slapos{&n.me}" web_site = context.getWebSiteValue()
came_from = web_site.absolute_url() + "/#!login?p.page=%s{&n.me}" % web_site.getLayoutProperty("configuration_frontpage_gadget_url")
credential_request = mail_message.getFollowUpValue() credential_request = mail_message.getFollowUpValue()
if credential_request.getValidationState() in ('submitted', 'accepted'): if credential_request.getValidationState() in ('submitted', 'accepted'):
message = translateString("Your account is already active.") message = translateString("Your account is already active.")
......
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