This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 57db2f5e58d0c7d250d8cc89b79fb02f5cd5595f Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Jul 31 15:27:10 2017 +0200 correction des URL de ressource + correction onglet de l'édition d'un sondage + lien de pied de page --- .../java/org/chorem/pollen/services/PollenUIContext.java | 10 ++++++++++ pollen-ui-riot-js/src/main/web/js/Session.js | 6 +++++- pollen-ui-riot-js/src/main/web/tag/PollenFooter.tag.html | 6 +++--- pollen-ui-riot-js/src/main/web/tag/poll/EditPoll.tag.html | 14 +++++++------- 4 files changed, 25 insertions(+), 11 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/PollenUIContext.java b/pollen-services/src/main/java/org/chorem/pollen/services/PollenUIContext.java index e2b07a45..b74ddd3a 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/PollenUIContext.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/PollenUIContext.java @@ -19,6 +19,8 @@ public class PollenUIContext implements Serializable { private String resourceUrl; + private String resourceDownloadUrl; + public String getUiEndPoint() { return uiEndPoint; } @@ -66,4 +68,12 @@ public class PollenUIContext implements Serializable { public void setResourceUrl(String resourceUrl) { this.resourceUrl = resourceUrl; } + + public String getResourceDownloadUrl() { + return resourceDownloadUrl; + } + + public void setResourceDownloadUrl(String resourceDownloadUrl) { + this.resourceDownloadUrl = resourceDownloadUrl; + } } 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 67fed2ef..0bcd8e4c 100644 --- a/pollen-ui-riot-js/src/main/web/js/Session.js +++ b/pollen-ui-riot-js/src/main/web/js/Session.js @@ -35,6 +35,9 @@ class Session { this.locale = null; // pour contenir la configuration this.configuration = window.pollenConf; + if (this.configuration.endPoint.startsWith("/")) { + this.configuration.endPoint = window.location.origin + this.configuration.endPoint; + } // pour contenir les données à envoyer au serveur à chaque appel this.pollenUIContext = { uiEndPoint: window.location.origin, @@ -42,7 +45,8 @@ class Session { pollVoteUrl: window.location.origin + "/#poll/{pollId}/vote/{token}", pollVoteEditUrl: window.location.origin + "/#poll/{pollId}/vote/{voteId}/{token}", pollEditUrl: window.location.origin + "/#poll/{pollId}/edit/{token}", - resourceUrl: this.configuration.endPoint + "/v1/resources/{resourceId}/download" + resourceUrl: this.configuration.endPoint + "/v1/resources/{resourceId}", + resourceDownloadUrl: this.configuration.endPoint + "/v1/resources/{resourceId}/download" }; // pour contenir les traductions this.i18n = require("../i18n.json"); diff --git a/pollen-ui-riot-js/src/main/web/tag/PollenFooter.tag.html b/pollen-ui-riot-js/src/main/web/tag/PollenFooter.tag.html index 359ad824..9e50c3cb 100644 --- a/pollen-ui-riot-js/src/main/web/tag/PollenFooter.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/PollenFooter.tag.html @@ -20,10 +20,10 @@ */ <PollenFooter> <div class="links"> - <a href="https://pollen.chorem.org/v/latest/index.html">{__.doc}</a> - <a href="https://forge.chorem.org/projects/pollen/files">{__.download}</a> + <a href="https://gitlab.nuiton.org/chorem/pollen">{__.doc}</a> + <a href="https://gitlab.nuiton.org/chorem/pollen/tags">{__.download}</a> <a href="http://list.chorem.org/cgi-bin/mailman/listinfo/pollen-users">{__.contact}</a> - <a href="https://forge.chorem.org/projects/pollen">{__.participate}</a> + <a href="https://gitlab.nuiton.org/chorem/pollen">{__.participate}</a> <a href="http://www.gnu.org/licenses/agpl.html">{__.license}</a> <a href="http://www.codelutin.com/" target="_blank">Code Lutin</a> </div> diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/EditPoll.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/EditPoll.tag.html index e16bd74c..384f1649 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/EditPoll.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/EditPoll.tag.html @@ -54,9 +54,9 @@ require("../components/HumanInput.tag.html"); </div> <div class="form"> - <Description if={!showSummary && form.step === 0} form={form}/> - <Choices if={!showSummary && form.step === 1} form={form}/> - <Settings if={!showSummary && form.step === 2} form={form}/> + <Description if={!showSummary && form.step === 0} form={form} ref="description"/> + <Choices if={!showSummary && form.step === 1} form={form} ref="choices"/> + <Settings if={!showSummary && form.step === 2} form={form} ref="settings"/> <VoterList if={!showSummary && form.step === 3 && form.model.pollType === "RESTRICTED"} form={form} ref="voters"/> <Summary if={showSummary} form={form}/> @@ -126,13 +126,13 @@ require("../components/HumanInput.tag.html"); e.preventDefault(); e.stopPropagation(); if (this.form.step === 0) { - this.tags.description.submit(); + this.refs.description.submit(); } else if (this.form.step === 1) { - this.tags.choices.submit(); + this.refs.choices.submit(); } else if (this.form.step === 2) { - this.tags.settings.submit(); + this.refs.settings.submit(); } else if (this.form.step === 3) { - this.tags.voters.submit(); + this.refs.voters.submit(); } if (this.callAfterSubmit) { this.callAfterSubmit(); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.