branch develop updated (e724251 -> f3f2a5f)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git from e724251 overwrite angularui-boostrap datepicker directive to bind correctly date in input new f3f2a5f fix publicationDate error in document edit form 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 f3f2a5f0a1ac43c1a4ef3d39b3df83f4d5eb1d5a Author: Yannick Martel <martel@©odelutin.com> Date: Mon Feb 2 11:43:32 2015 +0100 fix publicationDate error in document edit form Summary of changes: coselmar-ui/src/main/webapp/js/coselmar-controllers.js | 3 +++ coselmar-ui/src/main/webapp/views/documents/editDocument.html | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit f3f2a5f0a1ac43c1a4ef3d39b3df83f4d5eb1d5a Author: Yannick Martel <martel@©odelutin.com> Date: Mon Feb 2 11:43:32 2015 +0100 fix publicationDate error in document edit form --- coselmar-ui/src/main/webapp/js/coselmar-controllers.js | 3 +++ coselmar-ui/src/main/webapp/views/documents/editDocument.html | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js index 66e274e..d9b9026 100644 --- a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js +++ b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js @@ -201,6 +201,9 @@ coselmarControllers.controller("DocumentViewCtrl", $scope.document = document; $scope.canEdit = !(document.relatedQuestions && document.relatedQuestions.length > 0); $scope.canEdit = $scope.canEdit && ($scope.currentUser.role == 'ADMIN' || $scope.currentUser.role == 'SUPERVISOR' || $scope.currentUser.userId == document.ownerId); + if (document.publicationDate) { + $scope.document.publicationDate = new Date(document.publicationDate); + } }); $scope.deleteDocument = function(documentId){ diff --git a/coselmar-ui/src/main/webapp/views/documents/editDocument.html b/coselmar-ui/src/main/webapp/views/documents/editDocument.html index 0cbb2fa..4d538e3 100644 --- a/coselmar-ui/src/main/webapp/views/documents/editDocument.html +++ b/coselmar-ui/src/main/webapp/views/documents/editDocument.html @@ -140,7 +140,7 @@ </div> </div> - <p ng-show="!document.externalUrl && !document.fileName && !upload.file !upload.file && currentUser.role != 'ADMIN'" + <p ng-show="!document.externalUrl && !document.fileName && !upload.file && currentUser.role != 'ADMIN'" class="help-block text-center clear">{{ 'document.message.requiredExternalUrlOrFile' | translate }}</p> </div> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm