Author: bleny Date: 2014-06-23 23:14:31 +0200 (Mon, 23 Jun 2014) New Revision: 2098 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2098 Log: fixes #5208 review rights for guest Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.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-23 20:59:08 UTC (rev 2097) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-06-23 21:14:31 UTC (rev 2098) @@ -189,6 +189,11 @@ public boolean isAuthorizedToExportContacts() { return userProfile.isAdmin() || userProfile.isCoordinatorOrObserver(); } + + public boolean isAuthorizedToExportSamplingPlan() { + return userProfile.isAdmin() || userProfile.isCoordinatorOrObserver(); + } + public boolean isAuthorizedToViewContactsComments() { return ! userProfile.isProfessional(); } @@ -206,7 +211,7 @@ } public boolean isAuthorizedToViewOtherCompanies() { - return ! userProfile.isCoordinatorOrObserver(); + return ! (userProfile.isCoordinatorOrObserver() || userProfile.isGuest()); } public boolean isAuthorizedToViewBoatDetails() { Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-06-23 20:59:08 UTC (rev 2097) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-06-23 21:14:31 UTC (rev 2098) @@ -141,9 +141,11 @@ <i class="icon-trash"></i> <s:text name="wao.ui.action.reset"/> </s:submit> - <s:submit action="export-sampling-plan" type="button" cssClass="btn"> - <i class="icon-download"></i> <s:text name="wao.ui.action.csvExport" /> - </s:submit> + <s:if test="authenticatedWaoUser.authorizedToExportSamplingPlan"> + <s:submit action="export-sampling-plan" type="button" cssClass="btn"> + <i class="icon-download"></i> <s:text name="wao.ui.action.csvExport" /> + </s:submit> + </s:if> </div> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp 2014-06-23 20:59:08 UTC (rev 2097) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp 2014-06-23 21:14:31 UTC (rev 2098) @@ -151,9 +151,11 @@ <i class="icon-trash"></i> <s:text name="wao.ui.action.reset"/> </s:submit> - <s:submit action="export-sampling-plan" type="button" cssClass="btn"> - <i class="icon-download"></i> <s:text name="wao.ui.action.csvExport" /> - </s:submit> + <s:if test="authenticatedWaoUser.authorizedToExportSamplingPlan"> + <s:submit action="export-sampling-plan" type="button" cssClass="btn"> + <i class="icon-download"></i> <s:text name="wao.ui.action.csvExport" /> + </s:submit> + </s:if> </div>