Author: bleny Date: 2014-07-24 11:24:17 +0200 (Thu, 24 Jul 2014) New Revision: 2167 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2167 Log: fixes #5506 add missing method in some links Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/boat-details.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/boat-details.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/boat-details.jsp 2014-07-24 09:21:11 UTC (rev 2166) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/boat-details.jsp 2014-07-24 09:24:17 UTC (rev 2167) @@ -169,7 +169,7 @@ </tbody> </table> - <s:url action="contacts" id="viewAssociatedContactsForBoatUrl"> + <s:url action="contacts!applyFilter" id="viewAssociatedContactsForBoatUrl"> <s:param name="filter.boatFilter.registrationCode" value="boatDetails.boatInfos.boat.immatriculation"/> <s:param name="filter.sampleRowFilter.companyIds" value="boatDetails.boatInfos.company.topiaId"/> <s:param name="filter.periodFrom"/> @@ -345,7 +345,7 @@ <s:text name="wao.ui.field.Boat.shipOwner"/> </th> <td class="no-border-top"> - <s:url action="boats" id="shipOwnerBoatsUrl"> + <s:url action="boats!applyFilter" id="shipOwnerBoatsUrl"> <s:param name="filter.shipOwnerIds" value="boatDetails.boatInfos.boat.shipOwner.topiaId"/> </s:url> <s:set name="shipOwnerBoatsTitle"> 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-07-24 09:21:11 UTC (rev 2166) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-07-24 09:24:17 UTC (rev 2167) @@ -470,7 +470,7 @@ </li> </s:if> <li> - <s:url action="sampling-plan" id="sampleRowZoomUrl"> + <s:url action="sampling-plan!applyFilter" id="sampleRowZoomUrl"> <s:param name="filter.periodFrom" value="%{formatMonth(firstSampleMonthDate)}"/> <s:param name="filter.periodTo" value="%{formatMonth(lastSampleMonthDate)}"/> <s:param name="filter.companyIds" value="%{filter.companyIds}"/> @@ -487,7 +487,7 @@ </li> <s:if test="authenticatedWaoUser.authorizedToViewBoats && elligibleBoatsProvided"> <li> - <s:url action="boats" id="viewElligibleBoatsUrl"> + <s:url action="boats!applyFilter" id="viewElligibleBoatsUrl"> <s:param name="filter.elligibleForSampleRowsFilter.sampleRowCodes" value="code" /> </s:url> <s:a href="%{viewElligibleBoatsUrl}"> @@ -497,7 +497,7 @@ </s:if> <s:if test="authenticatedWaoUser.authorizedToViewContacts && sampleRowContactCounts > 0"> <li> - <s:url action="contacts" id="viewAssociatedContactsUrl"> + <s:url action="contacts!applyFilter" id="viewAssociatedContactsUrl"> <s:param name="filter.sampleRowFilter.sampleRowCodes" value="code" /> <s:param name="filter.periodFrom" /> <s:param name="filter.periodTo" /> @@ -509,7 +509,7 @@ </s:if> <s:if test="authenticatedWaoUser.authorizedToCreateContact && newContactCreatable"> <li> - <s:url action="boats" id="createAssociatedContactUrl"> + <s:url action="boats!applyFilter" id="createAssociatedContactUrl"> <s:param name="startBoatSelectionForSampleRowId" value="sampleRowId" /> </s:url> <s:a href="%{createAssociatedContactUrl}"> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp 2014-07-24 09:21:11 UTC (rev 2166) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp 2014-07-24 09:24:17 UTC (rev 2167) @@ -443,7 +443,7 @@ </li> </s:if> <li> - <s:url action="sampling-plan" id="sampleRowZoomUrl"> + <s:url action="sampling-plan!applyFilter" id="sampleRowZoomUrl"> <s:param name="filter.periodFrom" value="%{formatMonth(firstSampleMonthDate)}"/> <s:param name="filter.periodTo" value="%{formatMonth(lastSampleMonthDate)}"/> <s:param name="filter.companyIds" value="%{filter.companyIds}"/> @@ -460,7 +460,7 @@ </li> <s:if test="authenticatedWaoUser.authorizedToViewBoats && elligibleBoatsProvided"> <li> - <s:url action="boats" id="viewElligibleBoatsUrl"> + <s:url action="boats!applyFilter" id="viewElligibleBoatsUrl"> <s:param name="filter.elligibleForSampleRowsFilter.sampleRowCodes" value="code" /> </s:url> <s:a href="%{viewElligibleBoatsUrl}"> @@ -470,7 +470,7 @@ </s:if> <s:if test="authenticatedWaoUser.authorizedToViewContacts && sampleRowContactCounts > 0"> <li> - <s:url action="contacts" id="viewAssociatedContactsUrl"> + <s:url action="contacts!applyFilter" id="viewAssociatedContactsUrl"> <s:param name="filter.sampleRowFilter.sampleRowCodes" value="code" /> <s:param name="filter.periodFrom" /> <s:param name="filter.periodTo" /> @@ -482,7 +482,7 @@ </s:if> <s:if test="authenticatedWaoUser.authorizedToCreateContact && newContactCreatable"> <li> - <s:url action="boats" id="createAssociatedContactUrl"> + <s:url action="boats!applyFilter" id="createAssociatedContactUrl"> <s:param name="startBoatSelectionForSampleRowId" value="sampleRowId" /> </s:url> <s:a href="%{createAssociatedContactUrl}">