Commit ec9de243 authored by Roque's avatar Roque

erp5_wendelin_data_lake_ui: fix login url

parent 9243a777
......@@ -25,6 +25,7 @@
//////////////////////////////////////////////
.declareAcquiredMethod("getUrlFor", "getUrlFor")
.declareAcquiredMethod("translateHtml", "translateHtml")
.declareAcquiredMethod("getSetting", "getSetting")
/////////////////////////////////////////////////////////////////
// declared methods
......@@ -44,7 +45,6 @@
var g = this;
return new RSVP.Queue()
.push(function () {
//return g.getUrlFor({command: 'display', options: {page: "logout"}});
return RSVP.all([
g.getUrlFor({command: 'display', options: {page: "preference"}}),
g.getUrlFor({command: 'display', options: {page: "download"}}),
......@@ -53,7 +53,7 @@
g.getUrlFor({command: 'display', options: {page: "logout"}}),
g.getUrlFor({command: 'display', options: {page: "fifdata"}}),
g.getUrlFor({command: 'display', options: {page: "register"}}),
g.getUrlFor({command: 'display', options: {page: "login"}})
g.getSetting('hateoas_url')
]);
})
.push(function (all_result) {
......@@ -68,7 +68,7 @@
"logout_href": all_result[4],
"data_download_href": all_result[5],
"register_href": all_result[6],
"login_href": all_result[7]
"login_href": all_result[7] + "connection/login_form"
})
);
})
......
......@@ -236,7 +236,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>985.24889.24350.2884</string> </value>
<value> <string>985.24907.61542.62720</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -254,7 +254,7 @@
</tuple>
<state>
<tuple>
<float>1595266175.28</float>
<float>1595267359.56</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