Opravená definice práv pro agendy Uživatelé a Práva

src/main/webapp/WEB-INF/spring/root-context.xml

@@ -74,8 +74,8 @@
     
 	<security:http auto-config="true" use-expressions="true">
 		<security:intercept-url pattern="/app/**" access="hasAnyRole('ROLE_USER', 'ROLE_ADMIN')"/>
-		<security:intercept-url pattern="/admin/users/**" access="hasRole('ROLE_ADMIN')"/>
+		<security:intercept-url pattern="/admin/users/**" access="hasRole('PERM_READ_USERS')"/>
-		<security:intercept-url pattern="/admin/permissions/**" access="hasRole('ROLE_ADMIN')"/>
+		<security:intercept-url pattern="/admin/permissions/**" access="hasRole('PERM_READ_PERMISSIONS')"/>
 		<security:intercept-url pattern="/admin/addressbook/**" access="hasRole('PERM_READ_ADDRESSBOOK')"/>
 		<security:intercept-url pattern="/munits/**" access="hasRole('PERM_READ_MUNITS')"/>
 		<security:form-login login-page="/login.zhtml"

src/main/webapp/app/navigation.zul

@@ -46,8 +46,8 @@
 		</tabpanel>
 		<tabpanel>
 			<menubar orient="vertical">
-				<menuitem label="${labels.AgendaUsers}" href="/admin/users" disabled="${not sec:isAllGranted('ROLE_ADMIN')}" width="120px"/>
+				<menuitem label="${labels.AgendaUsers}" href="/admin/users" disabled="${not sec:isAllGranted('PERM_READ_USERS')}" width="120px"/>
-				<menuitem label="Práva" href="/admin/permissions" disabled="${not sec:isAllGranted('ROLE_ADMIN')}"/>
+				<menuitem label="Práva" href="/admin/permissions" disabled="${not sec:isAllGranted('PERM_READ_PERMISSIONS')}"/>
 				<menuitem label="${labels.AgendaWorkgroups}" href="/admin/workgroups" disabled="${not sec:isAllGranted('PERM_READ_WORKGROUPS')}"/>
 			</menubar>
 		</tabpanel>