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 81a150c9d2cfc6f07a8cd0701e736fb900555720 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Fri Aug 1 13:33:57 2014 +0200 autoSave user in admin part --- pollen-ui-angular/src/main/webapp/i18n/en.js | 3 ++- pollen-ui-angular/src/main/webapp/i18n/fr.js | 1 + pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js | 4 +++- pollen-ui-angular/src/main/webapp/partials/user-admin-list.html | 3 +-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/i18n/en.js b/pollen-ui-angular/src/main/webapp/i18n/en.js index 3ad3439..63dd438 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/en.js +++ b/pollen-ui-angular/src/main/webapp/i18n/en.js @@ -41,7 +41,8 @@ var translateEN = { 'user.disableMe' : 'Disable me', 'user.disableMe.success' : 'Disable successfull', 'user.disableUser' : 'Disable user', -'user.disableUser.success' : 'Disable successfull', +'user.disableUser.success' : 'Disable user successfull', +'user.delete.success' : 'Delete user successfull', 'user.generatePassword' : 'Generate new password', 'user.generatePassword.success' : 'E-mail send with new password', 'user.error.password.diff' : 'Passwords not equal', diff --git a/pollen-ui-angular/src/main/webapp/i18n/fr.js b/pollen-ui-angular/src/main/webapp/i18n/fr.js index 81e089f..c9dedc9 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/fr.js +++ b/pollen-ui-angular/src/main/webapp/i18n/fr.js @@ -42,6 +42,7 @@ var translateFR = { 'user.disableMe.success' : 'Désactivation de mon compte avec succès', 'user.disableUser' : 'Désactiver l\'utilisateur', 'user.disableUser.success' : 'Désactivation de l\'utilisateur avec succès', +'user.delete.success' : 'Suppression de l\'utilisateur avec succès', 'user.generatePassword' : 'Générer un nouveau mot de passe', 'user.generatePassword.success' : 'Un mail avec le nouveau mot de passe vient d\'être envoyé..', 'user.error.password.diff' : 'Mot de passe différent', 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 931c461..1d06329 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js @@ -165,7 +165,9 @@ angular.module('userControllers', []) }); $scope.saveUser = function (user) { - User.admin(user); + User.admin(user, function(data) { + $rootScope.$broadcast('newSuccess', 'user.edit.success'); + }); }; $scope.generatePassword = function (user) { diff --git a/pollen-ui-angular/src/main/webapp/partials/user-admin-list.html b/pollen-ui-angular/src/main/webapp/partials/user-admin-list.html index dea16b2..86a92c6 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-admin-list.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-admin-list.html @@ -40,10 +40,9 @@ <tr ng-repeat="user in data.users | filter:search" ng-class="{ 'warning':user.isDisabled }"> <td>{{user.name || user.email}}</td> <td> - <input type="checkbox" ng-model="user.administrator" /> + <input type="checkbox" ng-model="user.administrator" auto-save="saveUser(user)"/> </td> <td class="action"> - <button class="btn btn-primary" ng-click="saveUser(user)" title="{{ 'action.save' | translate}}"> <span class="glyphicon glyphicon-save"></span> </button> <button class="btn btn-warning" ng-click="generatePassword(user)" title="{{ 'user.generatePassword' | translate}}"> <span class="glyphicon glyphicon-refresh"></span> </button> <button class="btn btn-warning" ng-click="banUser(user)" ng-disabled="user.isDisabled" title="{{ 'user.disableUser' | translate}}"> <span class="glyphicon glyphicon-ban-circle"></span> </button> <button class="btn btn-danger" ng-click="deleteUser(user)" title="{{ 'action.delete' | translate}}"> <span class="glyphicon glyphicon-trash"></span> </button> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.