Author: fdesbois Date: 2010-03-29 12:59:43 +0000 (Mon, 29 Mar 2010) New Revision: 395 Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java trunk/wao-ui/src/main/webapp/Contacts.tml Log: Evo #2063 : Only administrator and coordinator can import/export contacts 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 2010-03-27 20:00:39 UTC (rev 394) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-03-29 12:59:43 UTC (rev 395) @@ -203,38 +203,54 @@ @Property private UploadedFile contactsCsvFile; + /** + * Only administrator and coordinator can import/export contacts. + * + * @return true if import/export of contacts can be done + */ + public boolean canImportExport() { + return user.isAdmin() || + user.getUserRole().equals(UserRole.COORDINATOR); + } + @Log void onSuccessFromImportContacts() throws WaoException { - //importBoatsForm.clearErrors(); - try { - ImportResults result = serviceContact.importContactCsv(user, contactsCsvFile.getStream()); - // Suppress persitant list of contacts - contacts = null; - layout.addInfo(result.getNbRowsImported() + " contacts importés, " + - result.getNbRowsRefused() + " refusés."); - for (String error : result.getErrors()) { - layout.addInfo(error); + if (canImportExport()) { + try { + ImportResults result = serviceContact.importContactCsv(user, + contactsCsvFile.getStream()); + // Suppress persitant list of contacts + contacts = null; + layout.addInfo(result.getNbRowsImported() + " contacts " + + "importés, " + result.getNbRowsRefused() + + " refusés."); + for (String error : result.getErrors()) { + layout.addInfo(error); + } + } catch (WaoBusinessException eee) { + layout.addError(eee.getMessage()); } - } catch (WaoBusinessException eee) { - layout.addError(eee.getMessage()); } - //return importBoatsForm.getHasErrors() ? importBoatsForm : this; } StreamResponse onActionFromExportShowContacts() { - return new ExportStreamResponse("wao-contacts") { + if (canImportExport()) { + return new ExportStreamResponse("wao-contacts") { - @Override - public InputStream getStream() throws IOException { - InputStream result = null; - try { - result = serviceContact.exportContactCsv(getContactFilter()); - } catch (WaoException eee) { - throw new IOException(eee); + @Override + public InputStream getStream() throws IOException { + InputStream result = null; + try { + result = serviceContact.exportContactCsv( + getContactFilter()); + } catch (WaoException eee) { + throw new IOException(eee); + } + return result; } - return result; - } - }; + }; + } + return null; } /**************************** CONTACT LIST ********************************/ Modified: trunk/wao-ui/src/main/webapp/Contacts.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Contacts.tml 2010-03-27 20:00:39 UTC (rev 394) +++ trunk/wao-ui/src/main/webapp/Contacts.tml 2010-03-29 12:59:43 UTC (rev 395) @@ -14,9 +14,11 @@ <a t:type="actionlink" t:id="showFilters" t:zone="so-contacts-filters"> recherche avancée </a>  - <a t:type="actionlink" t:id="showImportExport" t:zone="so-contacts-importexport"> - import/export - </a> + <t:if t:test="canImportExport()"> + <a t:type="actionlink" t:id="showImportExport" t:zone="so-contacts-importexport"> + import/export + </a> + </t:if> </div> <!-- FILTRES --> <div t:type="zone" class="so-filters" t:id="filtersZone" t:visible="prop:filtersVisible" id="so-contacts-filters">