Author: bleny Date: 2014-05-14 15:28:09 +0200 (Wed, 14 May 2014) New Revision: 1939 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1939 Log: refs #4487 remove duplicate filters Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsFilterValues.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsFilterValues.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsFilterValues.java 2014-05-14 10:26:38 UTC (rev 1938) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsFilterValues.java 2014-05-14 13:28:09 UTC (rev 1939) @@ -58,8 +58,6 @@ protected SampleRowsFilterValues sampleRowsFilterValues; - protected SortedSet<FilterOption> boatNames = new TreeSet<>(); - protected SortedSet<FilterOption> boatRegistrationCodes = new TreeSet<>(); protected SortedSet<FilterOption> contactStates = new TreeSet<>(); @@ -94,8 +92,7 @@ Boat boat = contact.getBoat(); boatsFilterValues.addBoat(boat); - boatNames.add(FilterOption.forValueAndLabel(boat.getTopiaId(), boat.getDescription())); - boatRegistrationCodes.add(FilterOption.forValueAndLabel(boat.getTopiaId(), String.valueOf(boat.getImmatriculation()))); + boatRegistrationCodes.add(FilterOption.forValueAndLabel(String.valueOf(boat.getImmatriculation()), boat.getDescription())); SampleRow sampleRow = contact.getSampleRow(); sampleRowsFilterValues.addSampleRow(sampleRow); @@ -171,10 +168,6 @@ return sampleRowsFilterValues; } - public SortedSet<FilterOption> getBoatNames() { - return boatNames; - } - public SortedSet<FilterOption> getBoatRegistrationCodes() { return boatRegistrationCodes; } Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-05-14 10:26:38 UTC (rev 1938) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-05-14 13:28:09 UTC (rev 1939) @@ -126,16 +126,8 @@ <fieldset> - <s:select name="filter.boatFilter.boatIds" - label="%{getText('wao.ui.contacts.boatName')}" - list="filterValues.boatNames" - listKey="value" - listValue="label" - multiple="true" - dataBinding="boatNames"/> - <s:select name="filter.boatFilter.registrationCode" - label="%{getText('wao.ui.field.Boat.immatriculation')}" + label="%{getText('wao.ui.field.Contact.boat')}" list="filterValues.boatRegistrationCodes" listKey="value" listValue="label" Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp 2014-05-14 10:26:38 UTC (rev 1938) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-contact-input.jsp 2014-05-14 13:28:09 UTC (rev 1939) @@ -54,7 +54,7 @@ var showHideContactStateMotif = function () { var contactState = $contactStateSelect.val(); - if (contactState === 'CONTACT_REFUSED' || contactState == 'CONTACT_DEFINITELY_REFUSED') { + if (contactState === 'CONTACT_REFUSED' || contactState === 'CONTACT_DEFINITELY_REFUSED') { $contactStateMotif.show(); } else { $contactStateMotif.hide();