Author: bleny Date: 2011-04-12 13:57:20 +0000 (Tue, 12 Apr 2011) New Revision: 1187 Log: fix list of observers in possible values Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactFilterValuesImpl.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/ContactFilterComponent.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2011-04-12 10:07:44 UTC (rev 1186) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2011-04-12 13:57:20 UTC (rev 1187) @@ -393,7 +393,10 @@ query.addEquals(sampleRowProperty.observationUnit(), filter.getObservationUnit()); } - if (filter.getObserver() != null) { + // XXX 2011 04 12 using UserFilter#observer for both samplingfilter and + // contact filter may lead to buggy filters (observers filters in contacts / obsdeb + // sampling plan) + if (filter.getObsProgram() == ObsProgram.OBSDEB && filter.getObserver() != null) { query.addInElements(":sampleRowObserver", sampleRowProperty.observers()); query.addParam("sampleRowObserver", filter.getObserver()); } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactFilterValuesImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactFilterValuesImpl.java 2011-04-12 10:07:44 UTC (rev 1186) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactFilterValuesImpl.java 2011-04-12 13:57:20 UTC (rev 1187) @@ -53,7 +53,7 @@ public void fillContacts(List<Contact> contacts) { for (Contact contact : contacts) { addObservers(contact.getMainObserver()); - addAllObservers(contact.getSecondaryObservers()); + // addAllObservers(contact.getSecondaryObservers()); fillSampleRow(contact.getSampleRow()); } } Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/ContactFilterComponent.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/ContactFilterComponent.tml 2011-04-12 10:07:44 UTC (rev 1186) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/ContactFilterComponent.tml 2011-04-12 13:57:20 UTC (rev 1187) @@ -49,11 +49,11 @@ title="Rafraîchir les filtres en fonction de la société sélectionnée"/--> </t:if> <label for="observer">${message:wao.ui.misc.observer} :</label> - <t:topiaEntitySelector t:id="observer" - t:clazzName="WaoUser" - t:labelPropertyName="fullName" - t:values="possibleValuesForFilter.observersAsList" - t:selectedValue="filter.observer"/> + <t:topiaEntitySelector t:id="observer" + t:clazzName="WaoUser" + t:labelPropertyName="fullName" + t:values="possibleValuesForFilter.observersAsList" + t:selectedValue="filter.observer"/> <!--select t:type="select" t:id="observer" t:model="observerSelectModel" value="observerId" /--> </div> <p> </p>