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 cee2eb57854af5a8921bbff86c983f33303bd5d5 Author: Brendan Le Ny <bleny@codelutin.com> Date: Thu Feb 12 11:25:45 2015 +0100 On autorise le coordinateur à filtrer le plan selon le labo --- ...cies,_add_laboratories,_add_sclerochronology.sql | 4 ++++ wao-persistence/src/main/xmi/wao-model.zargo | Bin 62375 -> 62432 bytes .../ifremer/wao/services/AuthenticatedWaoUser.java | 9 ++++++++- .../service/administration/CompaniesService.java | 2 +- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/wao-persistence/src/main/resources/db/migration/V5_0__add_species,_add_laboratories,_add_sclerochronology.sql b/wao-persistence/src/main/resources/db/migration/V5_0__add_species,_add_laboratories,_add_sclerochronology.sql index 24e0ddc..808980f 100644 --- a/wao-persistence/src/main/resources/db/migration/V5_0__add_species,_add_laboratories,_add_sclerochronology.sql +++ b/wao-persistence/src/main/resources/db/migration/V5_0__add_species,_add_laboratories,_add_sclerochronology.sql @@ -79,3 +79,7 @@ alter table Contact add column sampleSize integer; alter table Contact add column sampleSubmission timestamp without time zone; alter table Contact add column sampleReception timestamp without time zone; alter table Contact add column sampleTreatment timestamp without time zone; + +alter table Company add column ifremer boolean; +update Company set ifremer = false; +update Company set ifremer = true where topiaId = 'fr.ifremer.wao.entity.Company#1264666492968#0.7507011202827637'; diff --git a/wao-persistence/src/main/xmi/wao-model.zargo b/wao-persistence/src/main/xmi/wao-model.zargo index 4b44361..9b5710d 100644 Binary files a/wao-persistence/src/main/xmi/wao-model.zargo and b/wao-persistence/src/main/xmi/wao-model.zargo differ diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java b/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java index 2492aa3..38944d7 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java @@ -246,7 +246,14 @@ public class AuthenticatedWaoUser implements Serializable{ } public boolean isAuthorizedToViewOtherCompanies() { - return ! (userProfile.isCoordinatorOrObserver() || userProfile.isGuest()); + boolean authorizedToViewOthersCompanies; + if (userProfile.getObsProgram().isSclerochronology()) { + authorizedToViewOthersCompanies = userProfile.isAdmin() + || userProfile.isCoordinator() && waoUser.getCompany().isIfremer(); + } else { + authorizedToViewOthersCompanies = ! (userProfile.isCoordinatorOrObserver() || userProfile.isGuest()); + } + return authorizedToViewOthersCompanies; } public boolean isAuthorizedToViewBoatDetails() { diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/CompaniesService.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/CompaniesService.java index 2f7aa05..b8dcc74 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/CompaniesService.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/CompaniesService.java @@ -87,7 +87,7 @@ public class CompaniesService extends WaoServiceSupport { CompanyTopiaDao dao = getCompanyDao(); - Company ifremer = dao.forNameEquals("IFREMER").findUnique(); + Company ifremer = dao.forIfremerEquals(true).findUnique(); return ifremer; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.