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 8530dd1ada86b5a500868c762818a7195dab1c79 Author: Kevin Morin <morin@codelutin.com> Date: Thu Jul 6 17:31:56 2017 +0200 La visibilité des commentaires par personne n'a pas de sens, remplacement par "par le créateur" --- pollen-persistence/src/main/xmi/pollen.zargo | Bin 26300 -> 26190 bytes .../rest/api/converter/JsonConverterTest.java | 4 ++-- pollen-ui-riot-js/src/main/web/i18n.json | 4 ++-- .../src/main/web/tag/poll/Settings.tag.html | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pollen-persistence/src/main/xmi/pollen.zargo b/pollen-persistence/src/main/xmi/pollen.zargo index aef16793..9489b909 100644 Binary files a/pollen-persistence/src/main/xmi/pollen.zargo and b/pollen-persistence/src/main/xmi/pollen.zargo differ diff --git a/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/converter/JsonConverterTest.java b/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/converter/JsonConverterTest.java index 81314aac..2d61e0e4 100644 --- a/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/converter/JsonConverterTest.java +++ b/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/converter/JsonConverterTest.java @@ -66,7 +66,7 @@ public class JsonConverterTest { String pollStr = "{topiaCreateDate: 1399033089600, title: \"pollTitle\", " + "choice: [ {value: \"choice1\", choiceType: \"TEXT\"}, " + "{value: \"choice2\", choiceType: \"IMAGE\"} ], voteVisibility: \"ANONYMOUS\", " + - "commentVisibility:\"NOBODY\", pollType: \"FREE\" }"; + "commentVisibility:\"CREATOR\", pollType: \"FREE\" }"; JsonConverter<Poll> converter = JsonConverter.newEntityConverter(new FullyQualifiedNamePlusUuidTopiaIdFactory(), Poll.class); @@ -75,7 +75,7 @@ public class JsonConverterTest { Assert.assertNotNull(poll); Assert.assertEquals("pollTitle", poll.getTitle()); Assert.assertEquals(VoteVisibility.ANONYMOUS, poll.getVoteVisibility()); - Assert.assertEquals(CommentVisibility.NOBODY, poll.getCommentVisibility()); + Assert.assertEquals(CommentVisibility.CREATOR, poll.getCommentVisibility()); Assert.assertEquals(PollType.FREE, poll.getPollType()); // Assert.assertEquals(2, poll.sizeChoice()); // Assert.assertEquals("choice1", poll.getChoice(0).getChoiceValue()); diff --git a/pollen-ui-riot-js/src/main/web/i18n.json b/pollen-ui-riot-js/src/main/web/i18n.json index 9e929a37..947699a3 100644 --- a/pollen-ui-riot-js/src/main/web/i18n.json +++ b/pollen-ui-riot-js/src/main/web/i18n.json @@ -257,7 +257,7 @@ "poll_settings_resultVisibility_everybody": "Tout le monde", "poll_settings_resultVisibility_voter": "Les participants", "poll_settings_commentVisibility": "Qui peut voir les commentaires ?", - "poll_settings_commentVisibility_nobody": "Personne", + "poll_settings_commentVisibility_creator": "Uniquement le créateur", "poll_settings_commentVisibility_everybody": "Tout le monde", "poll_settings_commentVisibility_voter": "Les participants", "poll_settings_voteVisibility": "Qui peut voir les votes ?", @@ -759,7 +759,7 @@ "poll_settings_resultVisibility_everybody": "Everybody", "poll_settings_resultVisibility_voter": "Only voters", "poll_settings_commentVisibility": "Who can see comments?", - "poll_settings_commentVisibility_nobody": "Nobody", + "poll_settings_commentVisibility_creator": "Only creator", "poll_settings_commentVisibility_everybody": "Everybody", "poll_settings_commentVisibility_voter": "Only voters", "poll_settings_voteVisibility": "Who can see votes?", 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 cb9051b0..70a521e7 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 @@ -273,7 +273,7 @@ require("../components/date-time-picker.tag.html"); ref="commentVisibility" disabled={form.hasVotes || opts.form.model.isClosed} value={form.model.commentVisibility}> - <option value="NOBODY">{__.commentVisibility_nobody}</option> + <option value="CREATOR">{__.commentVisibility_creator}</option> <option value="VOTER">{__.commentVisibility_voter}</option> <option value="EVERYBODY">{__.commentVisibility_everybody}</option> </select> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.