Author: bleny Date: 2014-06-17 10:17:57 +0200 (Tue, 17 Jun 2014) New Revision: 2035 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2035 Log: fixes #5212 Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-wao-user.jsp 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-06-17 08:11:44 UTC (rev 2034) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/administration/edit-wao-user.jsp 2014-06-17 08:17:57 UTC (rev 2035) @@ -167,10 +167,15 @@ </s:if> <div class="form-actions"> - <s:url action="wao-users" id="waoUsersUrl"> - <s:param name="companyId" value="updateWaoUserCommand.companyId" /> - </s:url> - <s:a href="%{waoUsersUrl}" cssClass="btn"> + <s:if test="authenticatedWaoUser.authorizedToViewCompanyUsers"> + <s:url action="wao-users" id="cancelUrl"> + <s:param name="companyId" value="updateWaoUserCommand.companyId" /> + </s:url> + </s:if> + <s:else> + <s:url namespace="/%{obsProgram.name().toLowerCase()}" action="news" id="cancelUrl" /> + </s:else> + <s:a href="%{cancelUrl}" cssClass="btn"> <i class="icon-chevron-left"></i> <s:text name="wao.ui.action.cancel" /> </s:a>