branch develop updated (90b80fd -> b660ae2)
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 90b80fd Correction de l'import du plan scléro (refs #2263) new b660ae2 Dans les plans, on propose toujours l'action de création d'un contact (fixes #6398) 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 b660ae29fc62b9767109124ece9cd08e616c91c7 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) Summary of changes: .../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 +- .../main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp | 2 +- 4 files changed, 3 insertions(+), 8 deletions(-) -- 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 b660ae29fc62b9767109124ece9cd08e616c91c7 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) --- .../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 +- .../main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp | 2 +- 4 files changed, 3 insertions(+), 8 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 d2f7b41..5d2a07c 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 @@ -535,11 +535,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 08138b8..bc7bc74 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 c785096..db8f137 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" /> diff --git a/wao-web/src/main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp b/wao-web/src/main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp index 3511394..c461d38 100644 --- a/wao-web/src/main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp +++ b/wao-web/src/main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp @@ -404,7 +404,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