[wao] branch develop updated (30ff5e9 -> 83e6755)
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 30ff5e9 Fusion de la branche 6052 dans develop new 1071dd4 Simplification d'une expression booléenne new 83e6755 On surcharge toString() dans AuthenticatedWaoUser (pour les journaux) The 2 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 83e6755a5608ce8afd095c244f887cb564462ea9 Author: Brendan Le Ny <bleny@codelutin.com> Date: Wed Nov 5 16:31:34 2014 +0100 On surcharge toString() dans AuthenticatedWaoUser (pour les journaux) commit 1071dd45b20937efe5b10e6a10baefcd973bc768 Author: Brendan Le Ny <bleny@codelutin.com> Date: Wed Nov 5 16:30:16 2014 +0100 Simplification d'une expression booléenne Summary of changes: .../java/fr/ifremer/wao/services/AuthenticatedWaoUser.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 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 1071dd45b20937efe5b10e6a10baefcd973bc768 Author: Brendan Le Ny <bleny@codelutin.com> Date: Wed Nov 5 16:30:16 2014 +0100 Simplification d'une expression booléenne --- .../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 6f162bf..8e6ac6a 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 @@ -252,7 +252,7 @@ public class AuthenticatedWaoUser implements Serializable{ boolean canEdit = isCanWrite() && // user is admin and no validation program - (!isReadOnly() && isAdmin() && contact.getValidationProgram() == null + (isAdmin() && contact.getValidationProgram() == null || // or // user is coordinator or observer -- 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 83e6755a5608ce8afd095c244f887cb564462ea9 Author: Brendan Le Ny <bleny@codelutin.com> Date: Wed Nov 5 16:31:34 2014 +0100 On surcharge toString() dans AuthenticatedWaoUser (pour les journaux) --- .../main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java | 9 +++++++++ 1 file changed, 9 insertions(+) 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 8e6ac6a..2b133fd 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 @@ -21,6 +21,7 @@ package fr.ifremer.wao.services; * #L% */ +import com.google.common.base.Objects; import com.google.common.base.Preconditions; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.entity.Contact; @@ -320,4 +321,12 @@ public class AuthenticatedWaoUser implements Serializable{ return ! userProfile.isGuest() && ! userProfile.isProfessional(); } + @Override + public String toString() { + return Objects.toStringHelper(this) + .add("waoUser", waoUser) + .add("userProfile", userProfile) + .toString(); + } + } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm