Author: bleny Date: 2014-06-17 12:26:54 +0200 (Tue, 17 Jun 2014) New Revision: 2040 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2040 Log: refs #5247 professional should not be able to export contacts Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-06-17 09:56:21 UTC (rev 2039) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-06-17 10:26:54 UTC (rev 2040) @@ -186,6 +186,10 @@ return userProfile.isAdmin() && isCanWrite(); } + public boolean isAuthorizedToExportContacts() { + return userProfile.isAdmin() || userProfile.isCoordinatorOrObserver(); + } + public boolean isAuthorizedToEditSamplingPlan() { return userProfile.isAdmin() && isCanWrite(); } 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-06-17 09:56:21 UTC (rev 2039) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-06-17 10:26:54 UTC (rev 2040) @@ -225,9 +225,11 @@ <i class="icon-trash"></i> <s:text name="wao.ui.action.reset"/> </s:a> - <s:submit action="export-contacts" type="button" cssClass="btn"> - <i class="icon-download"></i> <s:text name="wao.ui.action.csvExport"/> - </s:submit> + <s:if test="authenticatedWaoUser.authorizedToExportContacts"> + <s:submit action="export-contacts" type="button" cssClass="btn"> + <i class="icon-download"></i> <s:text name="wao.ui.action.csvExport"/> + </s:submit> + </s:if> </div>