Author: bleny Date: 2014-05-19 12:22:31 +0200 (Mon, 19 May 2014) New Revision: 1956 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1956 Log: fixes #5104 only allow admin to set user receive mammals notifs Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-wao-user.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-05-19 10:14:12 UTC (rev 1955) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/AuthenticatedWaoUser.java 2014-05-19 10:22:31 UTC (rev 1956) @@ -319,4 +319,8 @@ return isCoordinatorOrObserver() && contact.getValidationCompany() == null; } + + public boolean isAuthorizedToAllowUsersToSubscribeToMammalsNotifications() { + return isAdmin(); + } } Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-wao-user.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-wao-user.jsp 2014-05-19 10:14:12 UTC (rev 1955) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-wao-user.jsp 2014-05-19 10:22:31 UTC (rev 1956) @@ -159,14 +159,13 @@ </fieldset> </s:if> - <fieldset> + <s:if test="authenticatedWaoUser.authorizedToAllowUsersToSubscribeToMammalsNotifications"> + <fieldset> + <legend><s:text name="wao.ui.form.WaoUser.preferences" /></legend> + <s:checkbox name="updateWaoUserCommand.waoUser.mammalsNotifications" label="%{getText('wao.ui.field.WaoUser.mammalsNotifications')}" /> + </fieldset> + </s:if> - <legend><s:text name="wao.ui.form.WaoUser.preferences" /></legend> - - <s:checkbox name="updateWaoUserCommand.waoUser.mammalsNotifications" label="%{getText('wao.ui.field.WaoUser.mammalsNotifications')}" /> - - </fieldset> - <div class="form-actions"> <s:url action="wao-users" id="waoUsersUrl"> <s:param name="companyId" value="updateWaoUserCommand.companyId" />