[pollen] branch develop updated (aa6b1b4 -> 9fbea16)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See http://git.chorem.org/pollen.git from aa6b1b4 style et ergonomie new efb0aa8 fix if poll.beginDate is not set new 9fbea16 fix autosave directive for watch ngModel The 2 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 9fbea166bab58a974af5e20e4c7219428c98bcd8 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed Aug 20 18:43:03 2014 +0200 fix autosave directive for watch ngModel commit efb0aa8c12f6feb79312a5291d164d1ef17b645e Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed Aug 20 18:42:02 2014 +0200 fix if poll.beginDate is not set Summary of changes: .../pollen/services/service/PollService.java | 7 ++++- pollen-ui-angular/src/main/webapp/js/directives.js | 33 +++++++++++----------- 2 files changed, 22 insertions(+), 18 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 develop in repository pollen. See http://git.chorem.org/pollen.git commit efb0aa8c12f6feb79312a5291d164d1ef17b645e Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed Aug 20 18:42:02 2014 +0200 fix if poll.beginDate is not set --- .../main/java/org/chorem/pollen/services/service/PollService.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java index 05bd263..8fd85ad 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java @@ -424,8 +424,13 @@ public class PollService extends PollenServiceSupport { checkNotBlank(errors, Poll.PROPERTY_TITLE, poll.getTitle(), l(getLocale(), "pollen.error.poll.title.mandatory")); + Date beginDate = poll.getBeginDate(); + if (beginDate == null) { + beginDate = getNow(); + } + if (poll.getEndDate() != null) { - check(errors, Poll.PROPERTY_END_DATE, poll.getEndDate().compareTo(poll.getBeginDate()) == 1, l(getLocale(), "pollen.error.poll.endDate.beforeBeginDate")); + check(errors, Poll.PROPERTY_END_DATE, poll.getEndDate().compareTo(beginDate) == 1, l(getLocale(), "pollen.error.poll.endDate.beforeBeginDate")); } if (poll.isChoiceAddAllowed()) { -- 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 develop in repository pollen. See http://git.chorem.org/pollen.git commit 9fbea166bab58a974af5e20e4c7219428c98bcd8 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed Aug 20 18:43:03 2014 +0200 fix autosave directive for watch ngModel --- pollen-ui-angular/src/main/webapp/js/directives.js | 33 +++++++++++----------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/directives.js b/pollen-ui-angular/src/main/webapp/js/directives.js index 7c4e02e..896b54f 100644 --- a/pollen-ui-angular/src/main/webapp/js/directives.js +++ b/pollen-ui-angular/src/main/webapp/js/directives.js @@ -216,13 +216,19 @@ angular.module('pollenDirective', []) }); var save = function () { - if (scope.change && !scope.lock) { - scope.$apply(function () { - scope.change = false; - scope.oldVal[attrs.ngModel] = scope.$eval(attrs.ngModel); - scope.$eval(attrs.autoSave); - }); - } + try { + scope.$digest(); + } catch (e) {} + + $timeout(function () { + if (scope.change && !scope.lock) { + scope.$apply(function () { + scope.change = false; + scope.oldVal[attrs.ngModel] = scope.$eval(attrs.ngModel); + scope.$eval(attrs.autoSave); + }); + } + }, 100); }; element.bind('change', function () { @@ -232,14 +238,6 @@ angular.module('pollenDirective', []) scope.timeout = $timeout(save,1000); }); - element.bind('dp.change', function() { - try { - scope.$digest(); - } - catch (e) { - } - }); - element.bind('dp.show', function() { scope.lock = true; @@ -628,10 +626,11 @@ angular.module('pollenDirective', []) scope.dateTimePicker.on("change", function() { var newDate = scope.dateTimePicker.data("DateTimePicker").getDate(); - if (newDate != null) { - scope.ngModel = new Date(scope.dateTimePicker.data("DateTimePicker").getDate().format()).getTime(); + if (newDate && moment(newDate).isValid) { + scope.ngModel = new Date(newDate).getTime(); } else { scope.ngModel = null; + scope.dateTimePicker.data("DateTimePicker").setDate(null); } }); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm