Author: bleny Date: 2011-05-06 13:38:07 +0000 (Fri, 06 May 2011) New Revision: 1263 Log: add delete button Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ObsDebSamplingPlan.java trunk/wao-ui/src/main/webapp/ObsDebSamplingPlan.tml Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ObsDebSamplingPlan.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ObsDebSamplingPlan.java 2011-05-06 12:29:32 UTC (rev 1262) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ObsDebSamplingPlan.java 2011-05-06 13:38:07 UTC (rev 1263) @@ -140,12 +140,13 @@ /********* GRID ********/ - private GridDataSource sampleRows; + @Persist + private SampleRowDataSource sampleRows; @Property private SampleRow sampleRow; - public GridDataSource getSampleRows() { + public SampleRowDataSource getSampleRows() { if (sampleRows == null) { sampleRows = new SampleRowDataSource(samplingFilter.getFilter(), serviceSampling); } @@ -171,6 +172,12 @@ return canEditSampleRow; } + @Log + public void onActionFromDeleteSampleRow(String sampleRowId) throws WaoBusinessException { + SampleRow sampleRow = getSampleRows().get(sampleRowId); + serviceSampling.deleteSampleRow(sampleRow); + } + /********** IMPORT / EXPORT *********/ public Block onSuccessFromImportForm() { Modified: trunk/wao-ui/src/main/webapp/ObsDebSamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/ObsDebSamplingPlan.tml 2011-05-06 12:29:32 UTC (rev 1262) +++ trunk/wao-ui/src/main/webapp/ObsDebSamplingPlan.tml 2011-05-06 13:38:07 UTC (rev 1263) @@ -146,10 +146,10 @@ <a t:type="pagelink" t:page="sampleRowForm" t:context="sampleRow.topiaId" title="${message:wao.ui.action.edit}" > <img src="${asset:context:}/img/edit.png" alt="${message:wao.ui.action.edit}" /> </a> - <!--a t:type="actionlink" t:id="deleteSampleRow" t:context="rowIndex" title="${message:wao.ui.action.deleteSampleRow}" - t:mixins="nuiton/confirm" t:message="${format:wao.ui.action.deleteSampleRow.confirm=row.code}"> - <img src="${asset:context:}/img/delete2.png" alt="${message:wao.ui.action.deleteSampleRow}" /> - </a--> + <a t:type="actionlink" t:id="deleteSampleRow" t:context="sampleRow.topiaId" title="${message:wao.ui.action.deleteSampleRow}" + t:mixins="nuiton/confirm" t:message="${format:wao.ui.action.deleteSampleRow.confirm=sampleRow.code}"> + <img src="${asset:context:}/img/delete2.png" alt="${message:wao.ui.action.deleteSampleRow}" /> + </a> </t:if> </p:actionsCell> </div>