Author: bleny Date: 2011-02-14 10:14:37 +0000 (Mon, 14 Feb 2011) New Revision: 1009 Log: make only accurate contact states in filters Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java trunk/wao-ui/src/main/webapp/Contacts.tml Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2011-02-14 10:10:25 UTC (rev 1008) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2011-02-14 10:14:37 UTC (rev 1009) @@ -70,6 +70,7 @@ import org.apache.tapestry5.services.BeanModelSource; import org.apache.tapestry5.services.javascript.JavaScriptSupport; import org.apache.tapestry5.upload.services.UploadedFile; +import org.apache.tapestry5.util.EnumSelectModel; import org.slf4j.Logger; import java.io.IOException; @@ -260,6 +261,13 @@ return terrestrialLocationSelectModel; } + public SelectModel getContactStateSelectModel() { + List<ContactState> allowedStates = ContactState.getAllowedStates(user.getProfile().getObsProgram()); + return new EnumSelectModel(ContactState.class, messages, + // just convert list to array + allowedStates.toArray(new ContactState[allowedStates.size()])); + } + @Property @Persist private String contactStateMotifId; Modified: trunk/wao-ui/src/main/webapp/Contacts.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Contacts.tml 2011-02-14 10:10:25 UTC (rev 1008) +++ trunk/wao-ui/src/main/webapp/Contacts.tml 2011-02-14 10:14:37 UTC (rev 1009) @@ -74,7 +74,11 @@ <label for="fromDate">${message:wao.ui.misc.since} :</label> <input t:type="datefield" class="width70" t:id="fromDate" value="contactFilter.fromDate" /> <label for="state">${message:wao.ui.field.Contact.contactState} :</label> - <select t:type="select" t:id="state" value="contactFilter.state" t:zone="so-contacts-filters" /> + <select t:type="select" + t:id="state" + value="contactFilter.state" + t:model="contactStateSelectModel" + t:zone="so-contacts-filters" /> <t:if test="contactStateMotifSelectModel"> <input t:type="select" t:id="stateMotif"