May 2011 - Wao-commits - mailman.cloud.codelutin.com

[Suiviobsmer-commits] r1247 - in trunk/wao-ui/src/main: java/fr/ifremer/wao/ui/pages webapp
by bleny＠users.labs.libre-entreprise.org May 2, 2011

May 2, 2011

Author: bleny Date: 2011-05-02 15:16:30 +0000 (Mon, 02 May 2011) New Revision: 1247 Log: add FIXME for bug in obsdebsamplingplan 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-02 12:36:26 UTC (rev 1246) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ObsDebSamplingPlan.java 2011-05-02 15:16:30 UTC (rev 1247) @@ -39,6 +39,7 @@ import org.apache.tapestry5.ComponentResources; import org.apache.tapestry5.StreamResponse; import org.apache.tapestry5.annotations.InjectComponent; +import org.apache.tapestry5.annotations.Log; import org.apache.tapestry5.annotations.Persist; import org.apache.tapestry5.annotations.Property; import org.apache.tapestry5.annotations.SessionState; @@ -47,6 +48,7 @@ import org.apache.tapestry5.grid.GridDataSource; import org.apache.tapestry5.ioc.annotations.Inject; import org.apache.tapestry5.services.BeanModelSource; +import org.slf4j.Logger; import java.io.IOException; import java.io.InputStream; @@ -59,6 +61,9 @@ /********* Tapestry stuffs **********/ @Inject + private Logger log; + + @Inject private BeanModelSource beanModelSource; @Inject @@ -97,6 +102,7 @@ return serviceSampling; } + @Log public boolean getShowImport() { if (showImport == null) { showImport = false; @@ -104,18 +110,18 @@ return showImport; } + @Log public Object onActionFromShowFilters() { samplingFilter.switchFiltersVisible(); return samplingFilter; } + // FIXME 20110502 bleny clicking on 'export' make the 'import' link still active but content is not showed/hidden + + @Log public Object onActionFromShowImport() { showImport = ! getShowImport(); - if (showImport) { - return importZone.getBody(); - } else { - return importZone; - } + return importZone.getBody(); } /********* GRID ********/ Modified: trunk/wao-ui/src/main/webapp/ObsDebSamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/ObsDebSamplingPlan.tml 2011-05-02 12:36:26 UTC (rev 1246) +++ trunk/wao-ui/src/main/webapp/ObsDebSamplingPlan.tml 2011-05-02 15:16:30 UTC (rev 1247) @@ -60,8 +60,10 @@ <div style="clear: both;" /> - <t:zone t:id="importZone" t:visible="false"> - <t:importFieldSet t:label="${message:wao.ui.import.samplingPlanLabel}" t:engine="samplingPlanImportEngine" /> + <t:zone t:id="importZone" t:visible="showImport"> + <t:if t:test="showImport"> + <t:importFieldSet t:label="${message:wao.ui.import.samplingPlanLabel}" t:engine="samplingPlanImportEngine" /> + </t:if> </t:zone> <t:samplingFilterComponent t:id="samplingFilter" t:user="connectedUser"

1 0

[Suiviobsmer-commits] r1246 - trunk/wao-business/src/main/java/fr/ifremer/wao/bean
by bleny＠users.labs.libre-entreprise.org May 2, 2011

May 2, 2011

Author: bleny Date: 2011-05-02 12:36:26 +0000 (Mon, 02 May 2011) New Revision: 1246 Log: no guest role for ObsDeb Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/UserRole.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/UserRole.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/UserRole.java 2011-05-01 14:51:23 UTC (rev 1245) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/UserRole.java 2011-05-02 12:36:26 UTC (rev 1246) @@ -89,7 +89,9 @@ allowedRoles.add(UserRole.OBSERVER); if (userRole.equals(UserRole.ADMIN)) { allowedRoles.add(UserRole.ADMIN); - allowedRoles.add(UserRole.GUEST); + if ( ! obsProgram.equals(ObsProgram.OBSDEB)) { + allowedRoles.add(UserRole.GUEST); + } if (obsProgram.equals(ObsProgram.OBSMER)) { allowedRoles.add(UserRole.PROFESSIONAL); }

1 0

[Suiviobsmer-commits] r1245 - trunk/wao-business/src/main/java/fr/ifremer/wao/entity
by bleny＠users.labs.libre-entreprise.org May 1, 2011

May 1, 2011

Author: bleny Date: 2011-05-01 14:51:23 +0000 (Sun, 01 May 2011) New Revision: 1245 Log: fix bugs when clearing observers when changing program of a sample row Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2011-04-29 14:29:07 UTC (rev 1244) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2011-05-01 14:51:23 UTC (rev 1245) @@ -469,6 +469,8 @@ super.setCompany(company); // clear observers because if the sample row is moved to another company, // we can't imagine that the observers will remains the same - clearObservers(); + if (getObsProgram() == ObsProgram.OBSDEB) { + clearObservers(); + } } }

1 0