Author: bleny Date: 2011-02-16 16:25:34 +0000 (Wed, 16 Feb 2011) New Revision: 1019 Log: fix user accesses levels Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Cartography.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java trunk/wao-ui/src/main/webapp/ContactForm.tml Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java 2011-02-16 14:28:07 UTC (rev 1018) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java 2011-02-16 16:25:34 UTC (rev 1019) @@ -176,7 +176,7 @@ public void initCompanyFilter() { // Very very important to do that at beginning // Evo #2227 : Guest user has no default company filter - if (!user.isAdmin() && !user.isGuest()) { + if (user.isCoordinatorOrObserver()) { if (log.isDebugEnabled()) { log.debug("Company filtered : " + user.getCompany().getName()); } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Cartography.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Cartography.java 2011-02-16 14:28:07 UTC (rev 1018) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Cartography.java 2011-02-16 16:25:34 UTC (rev 1019) @@ -101,7 +101,7 @@ filtersModel.setCompanyActive(true); // Initialize company - if (!user.isAdmin()) { + if (user.isCoordinatorOrObserver()) { getFilter().setCompany(user.getCompany()); } 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-16 14:28:07 UTC (rev 1018) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2011-02-16 16:25:34 UTC (rev 1019) @@ -194,7 +194,7 @@ @Override protected boolean isAvailableDataForFiltersOnly() { - return true; + return false; } Object onActionFromShowFilters() { Modified: trunk/wao-ui/src/main/webapp/ContactForm.tml =================================================================== --- trunk/wao-ui/src/main/webapp/ContactForm.tml 2011-02-16 14:28:07 UTC (rev 1018) +++ trunk/wao-ui/src/main/webapp/ContactForm.tml 2011-02-16 16:25:34 UTC (rev 1019) @@ -237,9 +237,12 @@ </div> <div id="mammalsInfoBox"> <label for="mammalsInfo"> - ${message:wao.ui.field.Contact.mammalsInfo} + ${message:wao.ui.field.Contact.mammalsInfo}<br /> + <span style="border: dashed 1px yellow; background-color: lightyellow; padding: 5px; position: relative; top: 10px;"> + ${message:wao.ui.page.ContactForm.mammalsInfo.disclaimer} + </span> </label> - <input t:type="textarea" t:id="mammalsInfo" value="contact.mammalsInfo" /> + <input t:type="textarea" t:id="mammalsInfo" t:value="contact.mammalsInfo" /> </div> </t:if> <t:if test="connectedUser.obsVente">