This is an automated email from the git hooks/post-receive script. New commit to branch feature/add_password_to_registration in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit bc8d680f8e6ff7041d2ed7f1aa78ace97fd82bfa Author: Kevin Morin <morin@codelutin.com> Date: Thu Mar 2 14:45:47 2017 +0100 refs #6 déplacement de la conf --- pollen-ui-riot-js/src/main/web/conf.js | 6 +----- pollen-ui-riot-js/src/main/web/js/FetchService.js | 2 +- pollen-ui-riot-js/src/main/web/js/Session.js | 5 +++++ 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/conf.js b/pollen-ui-riot-js/src/main/web/conf.js index 9d7bc95..1a1424f 100644 --- a/pollen-ui-riot-js/src/main/web/conf.js +++ b/pollen-ui-riot-js/src/main/web/conf.js @@ -11,9 +11,5 @@ window.pollenConf = { defaultDateFormat: "shortDate", defaultTimeFormat: "shortTime", defaultDateTimeFormat: "short", - debugI18n: false, - pollenUIContext: { - uiEndPoint: window.location.origin, - userValidateUrl: window.location.origin + "/#signcheck/{userId}/{token}" - } + debugI18n: false }; diff --git a/pollen-ui-riot-js/src/main/web/js/FetchService.js b/pollen-ui-riot-js/src/main/web/js/FetchService.js index 1b80eba..e2a1883 100644 --- a/pollen-ui-riot-js/src/main/web/js/FetchService.js +++ b/pollen-ui-riot-js/src/main/web/js/FetchService.js @@ -111,7 +111,7 @@ class FetchService { formData.set(key, value); } }); - formData.set("pollenUIContext", JSON.stringify(this.session.configuration.pollenUIContext)); + formData.set("pollenUIContext", JSON.stringify(this.session.pollenUIContext)); } return this.fetch(url, "POST", null, formData); } diff --git a/pollen-ui-riot-js/src/main/web/js/Session.js b/pollen-ui-riot-js/src/main/web/js/Session.js index 18186aa..9bfbc03 100644 --- a/pollen-ui-riot-js/src/main/web/js/Session.js +++ b/pollen-ui-riot-js/src/main/web/js/Session.js @@ -30,6 +30,11 @@ class Session { this.locale = null; // pour contenir la configuration this.configuration = window.pollenConf; + // pour contenir les données à envoyer au serveur à chaque appel + this.pollenUIContext = { + uiEndPoint: window.location.origin, + userValidateUrl: window.location.origin + "/#signcheck/{userId}/{token}" + }; // pour contenir les traductions this.i18n = require("../i18n.json"); // pour contenir l"utillisateur connecté -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.