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 b6a809a Fix way to pass login/password during login Add constant as config for services URL new b837a81 #6014 add service for modify user & some authorization management new c8a14d8 #6014 add way to modify user (as admin and as user for its own account) in UI new 166496f Merge branch 'feature/6014-modify-user' into develop The 3 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 166496f3b3eb0da9174658847cf5e4f4571a9e35 Merge: b6a809a c8a14d8 Author: Yannick Martel <martel@©odelutin.com> Date: Tue Nov 25 17:59:52 2014 +0100 Merge branch 'feature/6014-modify-user' into develop commit c8a14d839be2ed6d81bbbc07634e89fe940616a0 Author: Yannick Martel <martel@©odelutin.com> Date: Tue Nov 25 17:59:30 2014 +0100 #6014 add way to modify user (as admin and as user for its own account) in UI commit b837a8107a542acdb709c6a7d3326777f8dd7ebd Author: Yannick Martel <martel@©odelutin.com> Date: Tue Nov 25 11:48:43 2014 +0100 #6014 add service for modify user & some authorization management Summary of changes: .../java/fr/ifremer/coselmar/beans/UserBean.java | 9 + .../fr/ifremer/coselmar/beans/UserWebToken.java | 88 ++++++++++ .../services/CoselmarWebServiceSupport.java | 41 +++++ ...alException.java => UnauthorizedException.java} | 4 +- .../coselmar/services/v1/UsersWebService.java | 194 +++++++++++++++++++-- coselmar-rest/src/main/resources/mapping | 3 +- coselmar-ui/src/main/webapp/index.html | 4 +- .../src/main/webapp/js/coselmar-controllers.js | 30 +++- .../src/main/webapp/js/coselmar-user-services.js | 26 ++- coselmar-ui/src/main/webapp/js/coselmar.js | 2 +- .../src/main/webapp/views/users/edituser.html | 94 ++++++++++ .../src/main/webapp/views/users/newuser.html | 61 +------ coselmar-ui/src/main/webapp/views/users/user.html | 14 +- coselmar-ui/src/main/webapp/views/users/users.html | 6 +- 14 files changed, 485 insertions(+), 91 deletions(-) create mode 100644 coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/UserWebToken.java copy coselmar-rest/src/main/java/fr/ifremer/coselmar/services/errors/{InvalidCredentialException.java => UnauthorizedException.java} (52%) create mode 100644 coselmar-ui/src/main/webapp/views/users/edituser.html -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.