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 4c5b6ed017870c908ea47035f6111d9da5509747 Author: Yannick Martel <martel@©odelutin.com> Date: Thu Jan 15 15:11:18 2015 +0100 change 'Deleted' label to 'disable' for users, and redirect to users list after modify --- coselmar-ui/src/main/webapp/js/coselmar-controllers.js | 4 ++-- coselmar-ui/src/main/webapp/views/users/user.html | 2 +- coselmar-ui/src/main/webapp/views/users/users.html | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js index 9b457ee..aecc3cb 100644 --- a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js +++ b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js @@ -351,8 +351,8 @@ coselmarControllers.controller("UserViewCtrl", if(isValidForm) { userService.saveUser($scope.user, function() { - // On success, reload the view page - $location.search(""); + // On success, back on users list + $location.path("/users"); },function(error) { //TODO ymartel 20141118 : deal with error.status or statusText diff --git a/coselmar-ui/src/main/webapp/views/users/user.html b/coselmar-ui/src/main/webapp/views/users/user.html index c3c87ab..eebbedb 100644 --- a/coselmar-ui/src/main/webapp/views/users/user.html +++ b/coselmar-ui/src/main/webapp/views/users/user.html @@ -52,7 +52,7 @@ <tr> <td>Status</td> <td ng-if="user.active">Active</td> - <td ng-if="!user.active">Deleted</td> + <td ng-if="!user.active">Disable</td> </tr> </table> <div class="float-right"> diff --git a/coselmar-ui/src/main/webapp/views/users/users.html b/coselmar-ui/src/main/webapp/views/users/users.html index 765d71a..adff98a 100644 --- a/coselmar-ui/src/main/webapp/views/users/users.html +++ b/coselmar-ui/src/main/webapp/views/users/users.html @@ -109,7 +109,7 @@ <td>{{user.organization}}</td> <td>{{user.role}}</td> <td ng-if="user.active">Active</td> - <td ng-if="!user.active">Deleted</td> + <td ng-if="!user.active">Disable</td> <td> <a class="btn btn-action btn-edit" href="#/users/{{user.id}}?edit"> <span class="glyphicon glyphicon-edit" aria-hidden="true"></span>Modify -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.