branch develop updated (149e50f -> fe00227)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from 149e50f Modification du build pour filtrer web.xml afin d'injecter la version du projet dans la description du war (termine #6734) new fe00227 L'observateur peut désormais filtrer selon le labo/la société sur scléro (testable-client #6763) The 1 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 fe002277ef824301613c424a65c9124d04129cbb Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Mar 3 17:56:25 2015 +0100 L'observateur peut désormais filtrer selon le labo/la société sur scléro (testable-client #6763) Summary of changes: .../src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 fe002277ef824301613c424a65c9124d04129cbb Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Mar 3 17:56:25 2015 +0100 L'observateur peut désormais filtrer selon le labo/la société sur scléro (testable-client #6763) --- .../src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 38944d7..99c0edc 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 @@ -249,7 +249,7 @@ public class AuthenticatedWaoUser implements Serializable{ boolean authorizedToViewOthersCompanies; if (userProfile.getObsProgram().isSclerochronology()) { authorizedToViewOthersCompanies = userProfile.isAdmin() - || userProfile.isCoordinator() && waoUser.getCompany().isIfremer(); + || userProfile.isCoordinatorOrObserver() && waoUser.getCompany().isIfremer(); } else { authorizedToViewOthersCompanies = ! (userProfile.isCoordinatorOrObserver() || userProfile.isGuest()); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm