Author: sletellier Date: 2011-04-05 14:49:50 +0000 (Tue, 05 Apr 2011) New Revision: 1139 Log: Dont use same model as filter to select SampleRow on edit Boat Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java trunk/wao-ui/src/main/webapp/Boats.tml Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java 2011-04-04 14:14:10 UTC (rev 1138) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java 2011-04-05 14:49:50 UTC (rev 1139) @@ -591,7 +591,7 @@ private ElligibleBoat elligibleBoat; @Property - private String boatInfosSampleRowId; + private SampleRow boatInfosSampleRow; private boolean boatInfosEditable; @@ -727,6 +727,10 @@ /** /////////////////////// FOR EACH ELLIGIBLEBOAT ROW ///////////////// **/ + public List<SampleRow> getSampleRows() { + return serviceSampling.getSampleRowsByFilter(serviceSampling.newSamplingFilter(user)); + } + public List<ElligibleBoat> getElligibleBoatsValues() { return new ArrayList<ElligibleBoat>(getCompanyBoatInfos().getElligibleBoatsValues()); } @@ -818,9 +822,8 @@ void onSelectedFromAddBoatInfosSampleRow() throws WaoException { // We stay in edition mode boatInfosEditable = true; - if (StringUtils.isNotEmpty(boatInfosSampleRowId)) { - SampleRow row = getSampleRowSelectModel().findObject(boatInfosSampleRowId); - companyBoatInfos.setNewElligibleBoat(row); + if (boatInfosSampleRow != null) { + companyBoatInfos.setNewElligibleBoat(boatInfosSampleRow); } } Modified: trunk/wao-ui/src/main/webapp/Boats.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Boats.tml 2011-04-04 14:14:10 UTC (rev 1138) +++ trunk/wao-ui/src/main/webapp/Boats.tml 2011-04-05 14:49:50 UTC (rev 1139) @@ -62,7 +62,7 @@ <input t:type="submit" class="ico22px refresh" t:id="refreshBySector" value="Refresh" title="${message:wao.ui.filters.refresh}"/>  <label for="sampleRow">${message:wao.ui.field.SampleRow.code} :</label> - <select t:type="select" t:id="sampleRow" t:disabled="sampleRowExists" t:model="sampleRowSelectModel" value="sampleRowId" /> + <select t:type="select" t:id="sampleRow" t:disabled="sampleRowExists" t:model="sampleRowSelectModel" value="sampleRowId" /> </div><p> </p> <div> <!-- Boat filter --> @@ -342,8 +342,16 @@ </li> </ul> <p> - <input t:type="select" t:id="sampleRowSelect" t:model="sampleRowSelectModel" - t:value="boatInfosSampleRowId"/> + <t:topiaEntitySelector t:id="sampleRowSelect" + t:clazzName="SampleRow" + t:labelPropertyName="code" + t:values="sampleRows" + t:selectedValue="boatInfosSampleRow" /> + <!--input t:type="select" + t:id="sampleRowSelect" + t:model="sampleRowSelectModel" + t:value="boatInfosSampleRowId"/--> + <input t:type="submit" t:id="addBoatInfosSampleRow" class="ico add" value="Add" t:title="${message:wao.ui.action.add}" /> </p>