This is an automated email from the git hooks/post-receive script. New commit to branch feature/multi-ui in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 07850a16055ba133d2c90e3a47d3028e0fd9888b Author: jcouteau <couteau@codelutin.com> Date: Wed Oct 9 16:42:09 2019 +0200 Same order on mono and multi questions --- pollen-ui-riot-js/src/main/web/js/PollForm.js | 4 ++-- pollen-ui-riot-js/src/main/web/tag/poll/EditPoll.tag.html | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/js/PollForm.js b/pollen-ui-riot-js/src/main/web/js/PollForm.js index a7d43904..41152b4e 100644 --- a/pollen-ui-riot-js/src/main/web/js/PollForm.js +++ b/pollen-ui-riot-js/src/main/web/js/PollForm.js @@ -39,8 +39,8 @@ class PollForm { ]; this.stepsMulti = [ "general", - "options", - "questions" + "questions", + "options" ]; this.types = ["FREE", "RESTRICTED", "REGISTERED"]; 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 b06cf1ab..abff67b5 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 @@ -64,8 +64,8 @@ import "./CheckEmails.tag.html"; <Choices if={!showSummary && form.step === 1 && !form.multi} form={form} ref="choices"/> <Settings if={!showSummary && form.step === 2 && !form.multi} form={form} ref="settings"/> <VoterList if={!showSummary && form.step === 3 && form.model.pollType === "RESTRICTED"} form={form} ref="voters"/> - <VoteSettings if={!showSummary && form.step === 1 && form.multi} form={form} ref="voteSettings"/> - <EditQuestions if={!showSummary && form.step === 2 && form.multi} form={form} ref="editQuestions"/> + <VoteSettings if={!showSummary && form.step === 2 && form.multi} form={form} ref="voteSettings"/> + <EditQuestions if={!showSummary && form.step === 1 && form.multi} form={form} ref="editQuestions"/> <Summary if={showSummary} form={form}/> <div class="form-footer"> @@ -87,7 +87,7 @@ import "./CheckEmails.tag.html"; {_t.previous} </button> - <button if={form.step === 2 && form.multi && form.questionEdited !== 0} + <button if={form.step === 1 && form.multi && form.questionEdited !== 0} type={form.creation || form.model.closed ? "button" : "submit"} class="c-button c-button--info" tabindex="1" @@ -96,7 +96,7 @@ import "./CheckEmails.tag.html"; {_t.previousQuestion} </button> - <button if={form.step === 2 && form.multi} + <button if={form.step === 1 && form.multi} type="submit" class="c-button c-button--info" tabindex="1" @@ -167,12 +167,12 @@ import "./CheckEmails.tag.html"; e.stopPropagation(); if (this.form.step === 0) { this.refs.description.submit(); - } else if (this.form.step === 1 && this.form.multi) { + } else if (this.form.step === 2 && this.form.multi) { this.refs.voteSettings.submit(); + } else if (this.form.step === 1 && this.form.multi) { + this.refs.editQuestions.submit(); } else if (this.form.step === 1) { this.refs.choices.submit(); - } else if (this.form.step === 2 && this.form.multi) { - this.refs.editQuestions.submit(); } else if (this.form.step === 2) { this.refs.settings.submit(); } else if (this.form.step === 3) { -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.