branch develop updated (05dcfba -> c771001)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See http://git.forge.codelutin.com/coselmar.git from 05dcfba Ajout d'un message lorsque JS est désactivé car l'appli est inutilisable dans ce cas new c771001 Add cancel button on Projects close session 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 c771001205e8ae8e0bc514e18bd66a30a28fe6b2 Author: Yannick Martel <martel@©odelutin.com> Date: Thu Feb 11 11:00:54 2016 +0100 Add cancel button on Projects close session Summary of changes: coselmar-ui/src/main/webapp/js/coselmar-controllers.js | 3 +++ coselmar-ui/src/main/webapp/views/questions/closeQuestion.html | 3 +++ 2 files changed, 6 insertions(+) -- 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.forge.codelutin.com/coselmar.git commit c771001205e8ae8e0bc514e18bd66a30a28fe6b2 Author: Yannick Martel <martel@©odelutin.com> Date: Thu Feb 11 11:00:54 2016 +0100 Add cancel button on Projects close session --- coselmar-ui/src/main/webapp/js/coselmar-controllers.js | 3 +++ coselmar-ui/src/main/webapp/views/questions/closeQuestion.html | 3 +++ 2 files changed, 6 insertions(+) diff --git a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js index 5f240e5..fd8e708 100644 --- a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js +++ b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js @@ -1416,6 +1416,9 @@ coselmarControllers.controller("QuestionCtrl", ['$scope', '$route', '$routeParam $scope.cancelQuestionCreation = function(){ $location.path('/questions'); }; + $scope.cancelCloseSession = function(){ + $scope.closeSession = false; + }; $scope.closeQuestion = function(){ $scope.question.status = "CLOSED"; diff --git a/coselmar-ui/src/main/webapp/views/questions/closeQuestion.html b/coselmar-ui/src/main/webapp/views/questions/closeQuestion.html index cade85a..7584726 100644 --- a/coselmar-ui/src/main/webapp/views/questions/closeQuestion.html +++ b/coselmar-ui/src/main/webapp/views/questions/closeQuestion.html @@ -78,6 +78,9 @@ </div> <div class="actions"> + <a class="btn btn-action btn-cancel" ng-click="cancelCloseSession()"> + {{ 'common.button.cancel' | translate }} + </a> <a class="btn btn-action btn-success" ng-click="closeQuestion()"> <span class="fa fa-check-square-o" aria-hidden="true"></span>{{ 'question.button.close.fullText' | translate }} </a> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm