Author: bleny Date: 2014-04-03 15:18:50 +0200 (Thu, 03 Apr 2014) New Revision: 1820 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1820 Log: refs #4483 show sample row deletion button on only if it's not a creation Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-sample-row-input.jsp Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-sample-row-input.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-sample-row-input.jsp 2014-04-03 13:17:54 UTC (rev 1819) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-sample-row-input.jsp 2014-04-03 13:18:50 UTC (rev 1820) @@ -244,16 +244,17 @@ <s:a href="%{samplingPlanUrl}" cssClass="btn"> <i class="icon-chevron-left"></i> <s:text name="wao.ui.action.cancel" /> </s:a> - <s:submit type="button" cssClass="btn"> <i class="icon-hdd"></i> <s:text name="wao.ui.action.save" /> </s:submit> - <s:url action="delete-sample-row" id="deleteSampleRowUrl"> - <s:param name="sampleRowId" value="sampleRowId" /> - </s:url> - <s:a href="%{deleteSampleRowUrl}" cssClass="btn pull-right"> - <i class="icon-trash"></i> <s:text name="wao.ui.action.deleteSampleRow" /> - </s:a> + <s:if test=" ! updateSampleRowCommand.creation"> + <s:url action="delete-sample-row" id="deleteSampleRowUrl"> + <s:param name="sampleRowId" value="sampleRowId" /> + </s:url> + <s:a href="%{deleteSampleRowUrl}" cssClass="btn pull-right"> + <i class="icon-trash"></i> <s:text name="wao.ui.action.deleteSampleRow" /> + </s:a> + </s:if> </div> </s:form>