Author: fdesbois Date: 2010-01-19 18:49:07 +0000 (Tue, 19 Jan 2010) New Revision: 244 Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java trunk/suiviobsmer-ui/src/main/webapp/Contacts.tml Log: Revert using DataSource for Contacts (may be use for a future version, need to use orderBy from Grid) Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java 2010-01-19 18:47:57 UTC (rev 243) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/Contacts.java 2010-01-19 18:49:07 UTC (rev 244) @@ -114,7 +114,7 @@ private String editableContactId; void setupRender() throws SuiviObsmerException { - //initFilter(); + initFilter(); contacts = null; getContacts(); contactsForm.clearErrors(); @@ -141,7 +141,6 @@ public ContactFilter getContactFilter() throws SuiviObsmerException { if (contactFilter == null) { contactFilter = new ContactFilterImpl(); - initFilter(); // if (!user.getAdmin()) { // contactFilter.setCompany(user.getCompany()); // } @@ -262,8 +261,8 @@ private ContactModelFactory contactModelFactory; @Persist - private ContactDataSource contacts; -// private Map<String, Contact> contacts; +// private ContactDataSource contacts; + private Map<String, Contact> contacts; @Property private Contact contact; @@ -283,26 +282,26 @@ private boolean even = true; - public ContactDataSource getContacts() throws SuiviObsmerException { - if (contacts == null) { - if (log.isInfoEnabled()) { - log.info("Create DataSource"); - } - contacts = new ContactDataSource(getContactFilter(), serviceContact); - } - return contacts; - } - -// public Map<String, Contact> getContacts() throws SuiviObsmerException { +// public ContactDataSource getContacts() throws SuiviObsmerException { // if (contacts == null) { // if (log.isInfoEnabled()) { // log.info("Create DataSource"); // } -// contacts = serviceContact.getContactsByFilter(getContactFilter()); +// contacts = new ContactDataSource(getContactFilter(), serviceContact); // } // return contacts; // } + public Map<String, Contact> getContacts() throws SuiviObsmerException { + if (contacts == null) { + if (log.isInfoEnabled()) { + log.info("BUSINESS REQUEST [getContactsByFilter]"); + } + contacts = serviceContact.getContactsByFilter(getContactFilter()); + } + return contacts; + } + public BeanModel<Contact> getContactModel() { if (contactModel == null) { contactModel = user.getAdmin() ? Modified: trunk/suiviobsmer-ui/src/main/webapp/Contacts.tml =================================================================== --- trunk/suiviobsmer-ui/src/main/webapp/Contacts.tml 2010-01-19 18:47:57 UTC (rev 243) +++ trunk/suiviobsmer-ui/src/main/webapp/Contacts.tml 2010-01-19 18:49:07 UTC (rev 244) @@ -112,7 +112,7 @@ <t:zone t:id="gridZone" t:update="show"> <form t:type="form" t:id="contactsForm" t:zone="gridZone"> <t:errors id="so-contact-form-errors" t:banner="message:contactsForm-errors-banner"/> - <div t:type="grid" t:source="contacts" t:row="contact" class="t-data-grid ${gridClass}" t:model="contactModel" t:rowClass="prop:rowClass" + <div t:type="grid" t:source="contacts.values()" t:row="contact" class="t-data-grid ${gridClass}" t:model="contactModel" t:rowClass="prop:rowClass" t:rowsPerPage="20"> <p:createdByCell> <t:if t:test="editionMode">