Author: JirkaM Date: 2010-02-19 16:08:31 +0100 (Fri, 19 Feb 2010) New Revision: 1796 Modified: trunk/server/webServer2/WebContent/secured/userrel/listOfUsers.xhtml Log: * allow delete user only with lower role modified WebContent/secured/userrel/listOfUsers.xhtml Modified: trunk/server/webServer2/WebContent/secured/userrel/listOfUsers.xhtml =================================================================== --- trunk/server/webServer2/WebContent/secured/userrel/listOfUsers.xhtml 2010-02-19 14:38:04 UTC (rev 1795) +++ trunk/server/webServer2/WebContent/secured/userrel/listOfUsers.xhtml 2010-02-19 15:08:31 UTC (rev 1796) @@ -18,7 +18,7 @@ <f:facet name="header">#{lbl['user.list.body.title']}</f:facet> <h:panelGrid id="listOfUsers"> <rich:extendedDataTable value="#{usersBean.users}" - var="user_iterator" rows="10" height="364px;" + var="user_iterator" rows="10" height="370px;" enableContextMenu="false" id="tableListOfUsers" reRender="datascroller" sortMode="single" noDataLabel="#{lbl['list.empty']}" @@ -108,7 +108,11 @@ <div class="list-operations-item"> <a4j:commandButton id="DeleteUser" - rendered="#{user.user.id!=user_iterator.id and !user_iterator.system}" + rendered="#{user.user.id!=user_iterator.id and !user_iterator.system and ( + (user.compStr == 'admin' and user_iterator.role.role == 'user') || + (user.compStr == 'superadmin' and user_iterator.role.role == 'admin') || + (user.compStr == 'superadmin' and user_iterator.role.role == 'user') + )}" reRender="DeleteUserModalContent" oncomplete="Richfaces.showModalPanel('DeleteUserModal',{left:300, top:300})" image="/images/icons/delete.gif">