This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wao. See http://git.codelutin.com/wao.git commit f7a23face43333e21c40740a0b100f93c7e5425b Merge: 2379fdd 8a9d440 Author: Brendan Le Ny <bleny@codelutin.com> Date: Thu Dec 4 15:08:06 2014 +0100 Ajout de la notion de laboratoire Ifremer (fixes #2262) .../java/fr/ifremer/wao/AbstractWaoTopiaDao.java | 16 ++++ .../java/fr/ifremer/wao/entity/CompanyImpl.java | 5 ++ .../java/fr/ifremer/wao/entity/LaboratoryImpl.java | 12 +++ .../java/fr/ifremer/wao/entity/WaoUserImpl.java | 16 ++-- .../V4_3__add_species,_add_laboratories.sql | 1 + wao-persistence/src/main/xmi/wao-model.zargo | Bin 61426 -> 61324 bytes .../ifremer/wao/services/AuthenticatedWaoUser.java | 6 +- .../fr/ifremer/wao/services/ObsMerFixtures.java | 4 +- .../wao/services/service/WaoServiceSupport.java | 10 +++ .../service/administration/CompaniesService.java | 36 +++----- .../administration/LaboratoriesService.java | 71 +++++++++++++++ ... => OrganisationNameMustBeUniqueException.java} | 2 +- .../administration/OrganisationsService.java | 55 ++++++++++++ .../administration/UpdateWaoUserCommand.java | 32 +++---- .../service/administration/WaoUsersService.java | 28 +++--- .../administration/DeleteLaboratoryAction.java | 73 +++++++++++++++ .../action/administration/EditCompanyAction.java | 6 +- ...ompanyAction.java => EditLaboratoryAction.java} | 48 +++++----- .../action/administration/EditWaoUserAction.java | 16 ++-- .../action/administration/LaboratoriesAction.java | 33 ++++++- .../web/action/administration/WaoUsersAction.java | 14 +-- .../main/resources/i18n/wao-web_en_GB.properties | 11 ++- .../main/resources/i18n/wao-web_fr_FR.properties | 11 ++- .../content/administration/edit-laboratory.jsp | 67 ++++++++++++++ .../content/administration/edit-wao-user.jsp | 16 ++-- .../content/administration/laboratories.jsp | 100 +++++++++++++++++++++ .../src/main/webapp/WEB-INF/decorators/layout.jsp | 8 ++ 27 files changed, 577 insertions(+), 120 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.