branch feature/bug-on-save updated (e12c86ca -> 441fcda6)
This is an automated email from the git hooks/post-receive script. New change to branch feature/bug-on-save in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from e12c86ca refs #248 remove deprecated code new b2150808 refs #248 add voteCountingConfig to PollBean as it it send into the Json query and request failed if not present new 1f6a277b refs #248 fix to avoid js error new 441fcda6 refs #248 fix call unexisting function getConfig() The 3 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 441fcda6b766f6442e62db3e54eb04274da1e840 Author: dcosse <cosse@codelutin.com> Date: Mon Oct 7 16:19:25 2019 +0200 refs #248 fix call unexisting function getConfig() commit 1f6a277bdc239a2a8741fe0242d1095e27082d23 Author: dcosse <cosse@codelutin.com> Date: Mon Oct 7 15:48:13 2019 +0200 refs #248 fix to avoid js error commit b2150808c766d81b1d656755f48bab4bf88ec459 Author: dcosse <cosse@codelutin.com> Date: Mon Oct 7 15:47:38 2019 +0200 refs #248 add voteCountingConfig to PollBean as it it send into the Json query and request failed if not present Summary of changes: .../org/chorem/pollen/services/bean/PollBean.java | 19 +++++++++++++++++++ .../src/main/web/tag/poll/Choice.tag.html | 21 +++++++++++++++++---- .../src/main/web/tag/poll/Settings.tag.html | 2 +- 3 files changed, 37 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/bug-on-save in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit b2150808c766d81b1d656755f48bab4bf88ec459 Author: dcosse <cosse@codelutin.com> Date: Mon Oct 7 15:47:38 2019 +0200 refs #248 add voteCountingConfig to PollBean as it it send into the Json query and request failed if not present --- .../org/chorem/pollen/services/bean/PollBean.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollBean.java b/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollBean.java index d252c153..600c79a3 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollBean.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollBean.java @@ -26,6 +26,7 @@ import org.chorem.pollen.persistence.entity.Poll; import org.chorem.pollen.persistence.entity.PollType; import org.chorem.pollen.persistence.entity.ResultVisibility; import org.chorem.pollen.persistence.entity.VoteVisibility; +import org.chorem.pollen.votecounting.model.VoteCountingConfig; import java.util.ArrayList; import java.util.Date; @@ -131,6 +132,8 @@ public class PollBean extends PollenBean<Poll> { protected List<String> emailAddressSuffixes; protected List<QuestionBean> questions; + + protected VoteCountingConfig voteCountingConfig; public String getPermission() { return permission; @@ -426,4 +429,20 @@ public class PollBean extends PollenBean<Poll> { } this.questions.add(question); } + + /** + * TODO FIXE ME + * Not sure it should be there, but it is part of send query + */ + public VoteCountingConfig getVoteCountingConfig() { + return voteCountingConfig; + } + + /** + * TODO FIXE ME + * Not sure it should be there, but it is part of send query + */ + public void setVoteCountingConfig(VoteCountingConfig voteCountingConfig) { + this.voteCountingConfig = voteCountingConfig; + } } -- 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/bug-on-save in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 1f6a277bdc239a2a8741fe0242d1095e27082d23 Author: dcosse <cosse@codelutin.com> Date: Mon Oct 7 15:48:13 2019 +0200 refs #248 fix to avoid js error --- .../src/main/web/tag/poll/Choice.tag.html | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/Choice.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/Choice.tag.html index 3ec593e5..d317f688 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/Choice.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/Choice.tag.html @@ -30,15 +30,28 @@ import "../components/time-picker.tag.html"; title="{_t.text}"> <i class="fa fa-pencil" aria-hidden="true"></i> </button> - <input type="text" + <input show="{opts.choice.choiceType === 'TEXT'}" + type="text" ref="choiceText" tabindex="1" - class={opts.choice.choiceType === 'TEXT' ? 'selected' : 'hidden'} + class='selected' placeholder="{_t.text_placeholder}" disabled={opts.disabled} value={valueText} - required={opts.choice.choiceType === 'TEXT'} - pattern={opts.choice.choiceType === 'TEXT' ? ".*[^\\s]+.*" : ""} + required + pattern=".*[^\\s]+.*" + maxlength="255" + title={_t.text_notBlank} + onchange={onTextChange}/> + <input if="{opts.choice.choiceType !== 'TEXT'}" + type="text" + ref="choiceText" + tabindex="1" + class='hidden' + placeholder="{_t.text_placeholder}" + disabled={opts.disabled} + value={valueText} + pattern="" maxlength="255" title={_t.text_notBlank} onchange={onTextChange}/> -- 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/bug-on-save in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 441fcda6b766f6442e62db3e54eb04274da1e840 Author: dcosse <cosse@codelutin.com> Date: Mon Oct 7 16:19:25 2019 +0200 refs #248 fix call unexisting function getConfig() --- pollen-ui-riot-js/src/main/web/tag/poll/Settings.tag.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/Settings.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/Settings.tag.html index 4f4079ef..513121ab 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/Settings.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/Settings.tag.html @@ -523,7 +523,7 @@ import "../voteCountingType/MajorityJudgmentConfig.tag.html"; this.form.model.anonymousVoteAllowed = this.refs.anonymousVote.checked; this.form.model.resultVisibility = this.refs.resultVisibility.value; this.form.model.commentVisibility = this.refs.commentVisibility.value; - this.form.model.voteCountingConfig = this.refs.config ? this.refs.config.getConfig() : {}; + this.form.model.voteCountingConfig = this.refs.config && typeof this.refs.config.getConfig === "function" ? this.refs.config.getConfig() : {}; } this.form.model.endDate = this.refs.votePeriod.checked ? this.refs.endDate.getValue() : undefined; -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm