Author: bleny Date: 2011-06-10 08:48:49 +0000 (Fri, 10 Jun 2011) New Revision: 1334 Log: fix sample row context in boats 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-06-10 08:48:22 UTC (rev 1333) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java 2011-06-10 08:48:49 UTC (rev 1334) @@ -118,18 +118,22 @@ waoActivationContext = WaoActivationContext.newContextFromTapestry(ec); } - String[] onPassivate() { - WaoActivationContext waoActivationContext = WaoActivationContext.newEmptyContext(); - if (sampleRowContext != null) { - waoActivationContext.setSampleRowCode(sampleRowContext.getCode()); - } - return waoActivationContext.toStrings(); - } +// String[] onPassivate() { +// WaoActivationContext waoActivationContext = WaoActivationContext.newEmptyContext(); +// if (sampleRowContext != null) { +// waoActivationContext.setSampleRowCode(sampleRowContext.getCode()); +// } +// return waoActivationContext.toStrings(); +// } @Property @Persist private SampleRow sampleRowContext; + public void onActionFromCancelSelection() { + sampleRowContext = null; + } + void setupRender() throws WaoException, WaoBusinessException { // XXX bleny 20110511 resetting on page load may solve an issue when @@ -146,11 +150,14 @@ waoActivationContext.getShipOwnerName()); String sampleRowContextId = waoActivationContext.getSampleRowCode(); - if (sampleRowContextId == null) { - sampleRowContext = null; - } else { - sampleRowContext = serviceSampling.getSampleRowByCode(user, sampleRowContextId); - filterComponent.setSampleRow(sampleRowContext); + if (sampleRowContextId != null) { + SampleRow sampleRow = serviceSampling.getSampleRowByCode(user, sampleRowContextId); + filterComponent.setSampleRow(sampleRow); + if (user.isCoordinatorOrObserver()) { + sampleRowContext = sampleRow; + } else { + sampleRowContext = null; + } } } Modified: trunk/wao-ui/src/main/webapp/Boats.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Boats.tml 2011-06-10 08:48:22 UTC (rev 1333) +++ trunk/wao-ui/src/main/webapp/Boats.tml 2011-06-10 08:48:49 UTC (rev 1334) @@ -50,7 +50,7 @@ <t:if test="sampleRowContext"> <div style="text-align: center;"> - ${format:wao.ui.boats.selecting=sampleRowContext.code} + ${format:wao.ui.boats.selecting=sampleRowContext.code} (<a t:type="actionlink" t:id="cancelSelection">${message:wao.ui.action.cancel}</a>) </div> </t:if>