branch feature/multi-ui updated (c11f7f98 -> 615da406)
This is an automated email from the git hooks/post-receive script. New change to branch feature/multi-ui in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from c11f7f98 Fix js compilation problem new 615da406 Lint The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 615da40631f1a04e6bb87fd925e91346e70601ab Author: jcouteau <couteau@codelutin.com> Date: Fri Sep 20 16:09:36 2019 +0200 Lint Summary of changes: pollen-ui-riot-js/package.json | 2 +- .../src/main/web/tag/poll/EditQuestionsSettings.tag.html | 4 +--- pollen-ui-riot-js/src/main/web/tag/poll/EditVoteOrder.tag.html | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 615da40631f1a04e6bb87fd925e91346e70601ab Author: jcouteau <couteau@codelutin.com> Date: Fri Sep 20 16:09:36 2019 +0200 Lint --- pollen-ui-riot-js/package.json | 2 +- .../src/main/web/tag/poll/EditQuestionsSettings.tag.html | 4 +--- pollen-ui-riot-js/src/main/web/tag/poll/EditVoteOrder.tag.html | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pollen-ui-riot-js/package.json b/pollen-ui-riot-js/package.json index 6cd3937f..d7dc1e1e 100644 --- a/pollen-ui-riot-js/package.json +++ b/pollen-ui-riot-js/package.json @@ -30,7 +30,7 @@ "scripts": { "start": "webpack-dev-server --mode development --hot --inline --host 0.0.0.0 --public ${POLLEN_UI_CONTEXT:-localhost:8080}", "package": "webpack --config webpack.config.js --mode production", - "lint": "eslint src" + "lint": "eslint --ext .js,.tag.html /src/main" }, "devDependencies": { "@babel/core": "7.0.0-beta.46", diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/EditQuestionsSettings.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/EditQuestionsSettings.tag.html index eccad95d..b91f453e 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/EditQuestionsSettings.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/EditQuestionsSettings.tag.html @@ -225,14 +225,12 @@ import "../voteCountingType/MajorityJudgmentConfig.tag.html"; if (!this.showOptions && this.form.creation) { this.form.setQuestionDefaultSettings(this.question); - } else { - if (!this.form.hasVotes) { + } else if (!this.form.hasVotes) { this.question.addChoices = this.refs.addChoices.checked; this.question.beginChoiceDate = this.refs.addChoices.checked ? this.refs.beginChoiceDate.getValue() : undefined; this.question.endChoiceDate = this.refs.addChoices.checked ? this.refs.endChoiceDate.getValue() : undefined; this.question.voteCountingConfig = this.refs.config ? this.refs.config.getConfig() : {}; - } } }; diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/EditVoteOrder.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/EditVoteOrder.tag.html index 371b9fb7..6c3e3a5a 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/EditVoteOrder.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/EditVoteOrder.tag.html @@ -138,7 +138,7 @@ this.orderedAllChoices = false; this.poll = poll; - this.question = opts.question + this.question = opts.question; if (this.question) { this.poll.loadForVotes(this.question.id).then(() => { this.update(); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm