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>.