Author: bleny Date: 2014-06-19 10:30:31 +0200 (Thu, 19 Jun 2014) New Revision: 2061 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2061 Log: fixes #5277 Modified: trunk/pom.xml trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/BoatsAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ContactsAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SynthesisAction.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-18 09:23:04 UTC (rev 2060) +++ trunk/pom.xml 2014-06-19 08:30:31 UTC (rev 2061) @@ -120,7 +120,7 @@ <nuitonCsvVersion>3.0-rc-2</nuitonCsvVersion> <nuitonValidatorVersion>3.0-rc-1</nuitonValidatorVersion> <nuitonUtilsVersion>3.0-rc-3</nuitonUtilsVersion> - <eugeneVersion>2.10</eugeneVersion> + <eugeneVersion>2.11-SNAPSHOT</eugeneVersion> <topiaVersion>3.0-SNAPSHOT</topiaVersion> <!--Site configuration --> Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/BoatsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/BoatsAction.java 2014-06-18 09:23:04 UTC (rev 2060) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/BoatsAction.java 2014-06-19 08:30:31 UTC (rev 2061) @@ -21,6 +21,7 @@ * #L% */ +import com.google.common.base.Objects; import com.opensymphony.xwork2.Preparable; import fr.ifremer.wao.BoatsFilter; import fr.ifremer.wao.entity.Boat; @@ -122,7 +123,6 @@ if (filter == null) { filter = service.newBoatsFilter(getAuthenticatedWaoUser()); - getSession().setBoatsFilter(filter); } if (StringUtils.isNotBlank(startBoatSelectionForSampleRowId)) { @@ -146,7 +146,7 @@ @Override public String execute() { - filter = getSession().getBoatsFilter(); + filter = Objects.firstNonNull(session.getBoatsFilter(), filter); return applyFilter(); @@ -155,7 +155,6 @@ public String resetFilter() { filter = service.newBoatsFilter(getAuthenticatedWaoUser()); - getSession().setBoatsFilter(filter); return applyFilter(); @@ -163,6 +162,8 @@ public String applyFilter() { + getSession().setBoatsFilter(filter); + PaginationParameter pager = service.newBoatsPaginationParameter(pageNumber, 25); boatList = service.getBoatsList(getAuthenticatedWaoUser(), filter, pager); Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ContactsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ContactsAction.java 2014-06-18 09:23:04 UTC (rev 2060) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ContactsAction.java 2014-06-19 08:30:31 UTC (rev 2061) @@ -21,6 +21,7 @@ * #L% */ +import com.google.common.base.Objects; import com.opensymphony.xwork2.Preparable; import fr.ifremer.wao.ContactsFilter; import fr.ifremer.wao.WaoUtils; @@ -110,7 +111,6 @@ if (filter == null) { filter = service.newContactFilter(getAuthenticatedWaoUser()); - getSession().setContactsFilter(filter); } } @@ -118,7 +118,7 @@ @Override public String execute() { - filter = getSession().getContactsFilter(); + filter = Objects.firstNonNull(session.getContactsFilter(), filter); return applyFilter(); @@ -127,13 +127,15 @@ public String resetFilter() { filter = service.newContactFilter(getAuthenticatedWaoUser()); - getSession().setContactsFilter(filter); return applyFilter(); } public String applyFilter() { + + getSession().setContactsFilter(filter); + PaginationParameter pager = service.newContactsPaginationParameter(pageNumber, 25); contactsList = service.getContactsList(getAuthenticatedWaoUser(), filter, pager); @@ -141,6 +143,7 @@ lastRangePage = getPaginationLastPage(contactsList.getContacts(), 10, firstRangePage); return SUCCESS; + } protected Date now = new Date(); Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java 2014-06-18 09:23:04 UTC (rev 2060) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java 2014-06-19 08:30:31 UTC (rev 2061) @@ -21,6 +21,7 @@ * #L% */ +import com.google.common.base.Objects; import com.opensymphony.xwork2.Preparable; import fr.ifremer.wao.SampleRowsFilter; import fr.ifremer.wao.services.service.ObsMerSamplingPlan; @@ -58,7 +59,6 @@ if (filter == null) { filter = service.newSampleRowsFilter(getAuthenticatedWaoUser()); - getSession().setSampleRowsFilter(filter); } } @@ -66,7 +66,7 @@ @Override public String execute() { - filter = getSession().getSampleRowsFilter(); + filter = Objects.firstNonNull(session.getSampleRowsFilter(), filter); return applyFilter(); @@ -76,14 +76,14 @@ filter = service.newSampleRowsFilter(getAuthenticatedWaoUser()); - getSession().setSampleRowsFilter(filter); - return applyFilter(); } public String applyFilter() { + getSession().setSampleRowsFilter(filter); + samplingPlan = service.getSamplingPlan(getAuthenticatedWaoUser(), filter); return SUCCESS; Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SynthesisAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SynthesisAction.java 2014-06-18 09:23:04 UTC (rev 2060) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SynthesisAction.java 2014-06-19 08:30:31 UTC (rev 2061) @@ -1,5 +1,6 @@ package fr.ifremer.wao.web.action.obsmer; +import com.google.common.base.Objects; import com.opensymphony.xwork2.Preparable; import fr.ifremer.wao.ContactsFilter; import fr.ifremer.wao.services.service.ObsMerSynthesis; @@ -30,7 +31,6 @@ if (filter == null) { filter = service.newFilter(getAuthenticatedWaoUser()); - getSession().setSynthesisFilter(filter); } } @@ -38,7 +38,7 @@ @Override public String execute() { - filter = getSession().getSynthesisFilter(); + filter = Objects.firstNonNull(session.getSynthesisFilter(), filter); return applyFilter(); @@ -47,13 +47,15 @@ public String resetFilter() { filter = service.newFilter(getAuthenticatedWaoUser()); - getSession().setSynthesisFilter(filter); return applyFilter(); } public String applyFilter() { + + getSession().setSynthesisFilter(filter); + synthesis = service.getObsMerSynthesis(filter); return SUCCESS;