From 21ebddc4ef58c9a6da47a2f2f9b6530384ec73c8 Mon Sep 17 00:00:00 2001
From: Josef Rokos <pepa@bukova.info>
Date: Mon, 7 Jul 2014 12:34:33 +0200
Subject: [PATCH] =?UTF-8?q?Opraven=C3=A1=20definice=20pr=C3=A1v=20pro=20ag?=
 =?UTF-8?q?endy=20U=C5=BEivatel=C3=A9=20a=20Pr=C3=A1va?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/spring/root-context.xml | 4 ++--
 src/main/webapp/app/navigation.zul              | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/WEB-INF/spring/root-context.xml b/src/main/webapp/WEB-INF/spring/root-context.xml
index 7bff9f17..57c97f6d 100644
--- a/src/main/webapp/WEB-INF/spring/root-context.xml
+++ b/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/permissions/**" access="hasRole('ROLE_ADMIN')"/>
+		<security:intercept-url pattern="/admin/users/**" access="hasRole('PERM_READ_USERS')"/>
+		<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"
diff --git a/src/main/webapp/app/navigation.zul b/src/main/webapp/app/navigation.zul
index 6418c5d7..4c9d7a3a 100644
--- a/src/main/webapp/app/navigation.zul
+++ b/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="Práva" href="/admin/permissions" disabled="${not sec:isAllGranted('ROLE_ADMIN')}"/>
+				<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('PERM_READ_PERMISSIONS')}"/>
 				<menuitem label="${labels.AgendaWorkgroups}" href="/admin/workgroups" disabled="${not sec:isAllGranted('PERM_READ_WORKGROUPS')}"/>
 			</menubar>
 		</tabpanel>