[pollen] branch develop updated (066c248 -> cbb1e87)
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 066c248 Merge branch 'feature/dateTimePicker' into develop new cbb1e87 fix date empty in pollService, fix init date in directive datetimepicker 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 cbb1e87cfb842267c3bca10ab8be9960c10c079c Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed Jul 30 12:55:45 2014 +0200 fix date empty in pollService, fix init date in directive datetimepicker Summary of changes: .../org/chorem/pollen/services/service/PollService.java | 17 +++++++++++++++++ pollen-ui-angular/src/main/webapp/js/directives.js | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) -- 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 cbb1e87cfb842267c3bca10ab8be9960c10c079c Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed Jul 30 12:55:45 2014 +0200 fix date empty in pollService, fix init date in directive datetimepicker --- .../org/chorem/pollen/services/service/PollService.java | 17 +++++++++++++++++ pollen-ui-angular/src/main/webapp/js/directives.js | 2 +- 2 files changed, 18 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 ed55a43..7c28055 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 @@ -33,6 +33,7 @@ import org.nuiton.util.pagination.PaginationResult; import java.io.File; import java.util.ArrayList; +import java.util.Date; import java.util.List; import static org.nuiton.i18n.I18n.l; @@ -61,6 +62,22 @@ public class PollService extends PollenServiceSupport { input.setResultIsVisible(isPermitted(PermissionVerb.readPollResult, input.getEntityId())); + if (input.isChoiceAddAllowed()) { + Date endDate = input.getEndChoiceDate(); + if (endDate == null) { + endDate = input.getEndDate(); + if (endDate == null) { + input.setAddChoiceAllowed(true); + } + } + + if (endDate != null) { + input.setAddChoiceAllowed(endDate.compareTo(serviceContext.getNow()) > 0); + } + } else { + input.setAddChoiceAllowed(false); + } + return input; } }; diff --git a/pollen-ui-angular/src/main/webapp/js/directives.js b/pollen-ui-angular/src/main/webapp/js/directives.js index 83fc937..451aa94 100644 --- a/pollen-ui-angular/src/main/webapp/js/directives.js +++ b/pollen-ui-angular/src/main/webapp/js/directives.js @@ -504,7 +504,7 @@ angular.module('pollenDirective', []) }); var setDate = function () { - if (angular.isDefined(scope.ngModel)) { + if (angular.isDefined(scope.ngModel) && scope.ngModel != null) { scope.dateTimePicker.data("DateTimePicker").setDate(new Date(scope.ngModel)); } }; setDate(); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm