Author: bleny Date: 2014-06-23 22:41:01 +0200 (Mon, 23 Jun 2014) New Revision: 2095 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2095 Log: fixes #5317 remove hardcoded namespace in s:url Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/sample-row-log.jsp trunk/wao-web/src/main/webapp/endpoints-js.jsp Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/sample-row-log.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/sample-row-log.jsp 2014-06-23 20:38:28 UTC (rev 2094) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/sample-row-log.jsp 2014-06-23 20:41:01 UTC (rev 2095) @@ -68,7 +68,7 @@ <s:textarea name="comment" label="%{getText('wao.ui.misc.comment')}" /> <div class="form-actions"> - <s:url namespace="/obsmer" action="sampling-plan" id="samplingPlanUrl" /> + <s:url action="sampling-plan" id="samplingPlanUrl" /> <s:a href="%{samplingPlanUrl}" cssClass="btn"> <i class="icon-chevron-left"></i> <s:text name="wao.ui.action.goBackToSamplingPlan" /> </s:a> @@ -87,7 +87,7 @@ <s:else> <div class="form-actions"> - <s:url namespace="/obsmer" action="sampling-plan" id="samplingPlanUrl" /> + <s:url action="sampling-plan" id="samplingPlanUrl" /> <s:a href="%{samplingPlanUrl}" cssClass="btn"> <i class="icon-chevron-left"></i> <s:text name="wao.ui.action.goBackToSamplingPlan" /> </s:a> Modified: trunk/wao-web/src/main/webapp/endpoints-js.jsp =================================================================== --- trunk/wao-web/src/main/webapp/endpoints-js.jsp 2014-06-23 20:38:28 UTC (rev 2094) +++ trunk/wao-web/src/main/webapp/endpoints-js.jsp 2014-06-23 20:41:01 UTC (rev 2095) @@ -34,7 +34,7 @@ WAO.GET_BOAT_CONTACTS_COUNT_JSON_URL = '<s:url namespace="/" action="get-boat-contacts-count-json"/>'; WAO.SEARCH_BOAT_JSON_URL = '<s:url namespace="/" action="search-boat-json"/>'; - WAO.CONTACTS_FILTER_VALUES_JSON_URL = '<s:url namespace="/obsmer" action="contacts-filter-values-json"/>'; + WAO.CONTACTS_FILTER_VALUES_JSON_URL = '<s:url namespace="/" action="contacts-filter-values-json"/>'; // fragments WAO.BOAT_DETAILS_URL = '<s:url namespace="/" action="boat-details"/>';