This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 3a94b7726c8d92593e58351b2961c1cb2b40cee0 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Tue May 20 14:33:43 2014 +0200 catch error in form register --- .../src/main/webapp/js/controllers/userCtrl.js | 11 ++++++++++- .../src/main/webapp/partials/user-register.html | 15 ++++++++++++--- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js index a41f7a0..a484de4 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js @@ -20,9 +20,18 @@ */ angular.module('userControllers', []) .controller('UserRegisterCtrl', ['$scope', 'User', function ($scope, User) { + + if (!angular.isDefined($scope.data)) { + $scope.data = {}; + } + $scope.data.user = {login:'', email:'', password:'', password2:''}; + $scope.submit = function () { if ($scope.data.user.password == $scope.data.user.password2) { - User.add({}, $scope.data.user); + User.add({}, $scope.data.user, function (data) { + }, function (error) { + $scope.restError = error.data; + }); } } }]) diff --git a/pollen-ui-angular/src/main/webapp/partials/user-register.html b/pollen-ui-angular/src/main/webapp/partials/user-register.html index 66ee85e..93c5dc0 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-register.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-register.html @@ -21,12 +21,18 @@ <div> <form ng-submit="submit()"> <div class="form-group"> - <label for="formName">Nom d'utilisateur : </label> + <label for="formName"> + Nom d'utilisateur : + <info-error error="restError.login[0]" data="data.user.login"></info-error> + </label> <input type="text" id="formName" name="login" class="form-control" ng-model="data.user.login"/> </div> <div class="form-group"> - <label for="formEmail">E-Mail :</label> + <label for="formEmail"> + E-Mail : + <info-error error="restError.email[0]" data="data.user.email"></info-error> + </label> <input type="email" id="formEmail" name="email" class="form-control" ng-model="data.user.email"/> </div> @@ -35,7 +41,10 @@ <input type="password" id="formPassword" name="password" class="form-control" ng-model="data.user.password"/> </div> <div class="form-group"> - <label for="formPassword2">Confirmation :</label> + <label for="formPassword2"> + Confirmation : + <span class="glyphicon glyphicon-exclamation-sign danger" tooltip="Mot de passe différent" ng-if="data.user.password != data.user.password2"></span> + </label> <input type="password" id="formPassword2" name="password2" class="form-control" ng-model="data.user.password2"/> </div> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm@chorem.org>.