Author: bleny Date: 2014-05-13 10:47:28 +0200 (Tue, 13 May 2014) New Revision: 1930 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1930 Log: refs #4490 use value instead of placeholder in compute contacts count form Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java 2014-05-13 08:43:06 UTC (rev 1929) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java 2014-05-13 08:47:28 UTC (rev 1930) @@ -24,6 +24,7 @@ import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.entity.ObsProgram; import fr.ifremer.wao.services.AuthenticatedWaoUser; +import org.apache.commons.lang3.time.DateUtils; import java.util.Date; @@ -101,4 +102,8 @@ return paginationUrl; } + public String getOneYearAgoDatePlaceHolder() { + return formatDate(DateUtils.addYears(new Date(), -1)); + } + } Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp 2014-05-13 08:43:06 UTC (rev 1929) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp 2014-05-13 08:47:28 UTC (rev 1930) @@ -241,8 +241,7 @@ <s:text name="wao.ui.boatDetails.boatContactsCounts.since"/> </span> - <s:set name="sincePlaceholder" value="%{formatDate(new java.util.Date())}"/> - <input name="since" type="text" placeholder="<s:property value="%{#sincePlaceholder}"/>"/> + <input name="since" type="text" value="<s:property value="%{oneYearAgoDatePlaceHolder}"/>"/> <button type="button" id="get-boat-contacts-count" class="btn"> <i class="icon-plus"></i> <s:text name="wao.ui.boatDetails.boatContactsCounts.compute" />