Author: tchemit Date: 2014-04-02 16:23:34 +0200 (Wed, 02 Apr 2014) New Revision: 1805 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1805 Log: remove struts.el.throwExceptionOnFailure configuration for the moment + fix a possible NPE Modified: trunk/wao-web/src/main/resources/struts.xml trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp Modified: trunk/wao-web/src/main/resources/struts.xml =================================================================== --- trunk/wao-web/src/main/resources/struts.xml 2014-04-02 14:06:41 UTC (rev 1804) +++ trunk/wao-web/src/main/resources/struts.xml 2014-04-02 14:23:34 UTC (rev 1805) @@ -29,7 +29,7 @@ <!-- Help debugging --> <constant name="struts.devMode" value="${devMode}"/> <constant name="struts.ognl.logMissingProperties" value="${devMode}"/> - <!-- FIXME --> + <!-- FIXME Maybe one day, too much pb in iterator when true --> <constant name="struts.el.throwExceptionOnFailure" value="false"/> <constant name="struts.i18n.reload" value="${devMode}"/> <constant name="struts.custom.i18n.resources" value="resources"/> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-04-02 14:06:41 UTC (rev 1804) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-04-02 14:23:34 UTC (rev 1805) @@ -248,7 +248,7 @@ <!-- Months columns --> <s:iterator value="samplingPlan.months" var="month"> - <th class="effort <s:if test="%{isCurrentMonth(#month)}"> now</s:if>"> + <th class="effort <s:if test="isCurrentMonth(#month)"> now</s:if>"> <s:property value="%{formatMonth(#month)}"/> </th> </s:iterator> @@ -315,7 +315,7 @@ <td class="only-in-full-view"><s:property value="fishingZones" /></td> <td class="only-in-compact-view"> <s:property value="fishingZones" /> - <s:if test=" ! fishingZonesInfos.empty"> + <s:if test=" fishingZonesInfos != null"> (<s:property value="fishingZonesInfos" />) </s:if> </td>