branch 4.2.4 created (now 383fa00)
This is an automated email from the git hooks/post-receive script. New change to branch 4.2.4 in repository wao. See http://git.codelutin.com/wao.git at 383fa00 Dans les plans, on propose toujours l'action de création d'un contact (fixes #6398) This branch includes the following new commits: new d243dca POM en 4.2.4 SNAPSHOT new 383fa00 Dans les plans, on propose toujours l'action de création d'un contact (fixes #6398) 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 383fa00e57ecb7d693dfc714b7fa8a46185e7dd9 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 13 16:41:18 2015 +0100 Dans les plans, on propose toujours l'action de création d'un contact (fixes #6398) Conflicts: wao-web/src/main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp commit d243dca40f2c8aa4b5e362e30bad0dbd916c5a11 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 13 16:39:12 2015 +0100 POM en 4.2.4 SNAPSHOT -- 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 4.2.4 in repository wao. See http://git.codelutin.com/wao.git commit d243dca40f2c8aa4b5e362e30bad0dbd916c5a11 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 13 16:39:12 2015 +0100 POM en 4.2.4 SNAPSHOT --- pom.xml | 2 +- wao-persistence/pom.xml | 2 +- wao-services/pom.xml | 2 +- wao-web/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index b16c287..65bc3de 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.2.3</version> + <version>4.2.4-SNAPSHOT</version> <packaging>pom</packaging> <name>Wao</name> diff --git a/wao-persistence/pom.xml b/wao-persistence/pom.xml index 9b185ff..b3152d6 100644 --- a/wao-persistence/pom.xml +++ b/wao-persistence/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.2.3</version> + <version>4.2.4-SNAPSHOT</version> </parent> <artifactId>wao-persistence</artifactId> diff --git a/wao-services/pom.xml b/wao-services/pom.xml index f9ecf12..cfaf345 100644 --- a/wao-services/pom.xml +++ b/wao-services/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.2.3</version> + <version>4.2.4-SNAPSHOT</version> </parent> <artifactId>wao-services</artifactId> diff --git a/wao-web/pom.xml b/wao-web/pom.xml index 5cbb6ed..8f0ca09 100644 --- a/wao-web/pom.xml +++ b/wao-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.2.3</version> + <version>4.2.4-SNAPSHOT</version> </parent> <artifactId>wao-web</artifactId> -- 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 4.2.4 in repository wao. See http://git.codelutin.com/wao.git commit 383fa00e57ecb7d693dfc714b7fa8a46185e7dd9 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 13 16:41:18 2015 +0100 Dans les plans, on propose toujours l'action de création d'un contact (fixes #6398) Conflicts: wao-web/src/main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp --- .../src/main/java/fr/ifremer/wao/services/service/SamplingPlan.java | 5 ----- wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp | 2 +- wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlan.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlan.java index 47eb232..765c0d8 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlan.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlan.java @@ -531,11 +531,6 @@ public abstract class SamplingPlan implements Iterable<SamplingPlan.SamplingPlan return isRecentlyUpdated; } - public boolean isNewContactCreatable() { - boolean isNewContactCreatable = new Date().before(lastSampleMonthEndOfMonth); - return isNewContactCreatable; - } - public long getSampleRowContactCounts() { return sampleRowContactCounts; } diff --git a/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp b/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp index 3a6e28b..58db538 100644 --- a/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp +++ b/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp @@ -492,7 +492,7 @@ </s:a> </li> </s:if> - <s:if test="authenticatedWaoUser.authorizedToCreateContact && newContactCreatable"> + <s:if test="authenticatedWaoUser.authorizedToCreateContact"> <li> <s:url action="boats!applyFilter" id="createAssociatedContactUrl"> <s:param name="startBoatSelectionForSampleRowId" value="sampleRowId" /> diff --git a/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp b/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp index cd1417c..57ee8aa 100644 --- a/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp +++ b/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp @@ -451,7 +451,7 @@ </s:a> </li> </s:if> - <s:if test="authenticatedWaoUser.authorizedToCreateContact && newContactCreatable"> + <s:if test="authenticatedWaoUser.authorizedToCreateContact"> <li> <s:url action="boats!applyFilter" id="createAssociatedContactUrl"> <s:param name="startBoatSelectionForSampleRowId" value="sampleRowId" /> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm