From f4bff3772967d3a6ea360d6c5d44d794c6092dbb Mon Sep 17 00:00:00 2001
From: Franta Pribyl <pribyl.franta@gmail.com>
Date: Fri, 3 Oct 2014 20:09:09 +0200
Subject: [PATCH] =?UTF-8?q?Polo=C5=BEky=20hlavn=C3=ADho=20menu=20podm?=
 =?UTF-8?q?=C3=ADn=C4=9Bny=20pr=C3=A1vama=20na=20jednotliv=C3=A9=20agendy.?=
 =?UTF-8?q?=20Povel=20kontextov=C3=A9=20n=C3=A1pov=C4=9Bdy=20podm=C3=ADn?=
 =?UTF-8?q?=C4=9Bn=20na=20pr=C3=A1va=20na=20objedn=C3=A1vky.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Proč ale stále skáče 403 u uživatele user1, který má práva na schválené
požadavky netuším.

refs #147
---
 src/main/webapp/app/mainMenu.zul              | 20 ++++++++++++-------
 src/main/webapp/main/orders/approved/grid.zul |  4 +++-
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/app/mainMenu.zul b/src/main/webapp/app/mainMenu.zul
index 9dd08de3..d09878c0 100644
--- a/src/main/webapp/app/mainMenu.zul
+++ b/src/main/webapp/app/mainMenu.zul
@@ -16,20 +16,24 @@
 				<menuitem
 					image="/img/beam-032.png"
 					label="${labels.MaterialRequirements}"
-					href="/main/orders/material/" />
+					href="/main/orders/material/"
+					disabled="${not sec:isAllGranted('PERM_READ_MATERIAL')}" />
 				<menuitem
 					image="/img/worker-032.png"
 					label="${labels.ServiceRequirements}"
-					href="/main/orders/services/" />
+					href="/main/orders/services/"
+					disabled="${not sec:isAllGranted('PERM_READ_SERVICES')}" />
 				<menuseparator />
 				<menuitem
 					image="/img/hammer-016.png"
 					label="${labels.ApprovedRequirementItems}"
-					href="/main/orders/approved/" />
+					href="/main/orders/approved/"
+					disabled="${not sec:isAllGranted('PERM_READ_APPROVED')}" />
 				<menuitem
 					image="/img/autotruck-016.png"
 					label="${labels.CreatedOrders}"
-					href="/main/orders/created/" />
+					href="/main/orders/created/"
+					disabled="${not sec:isAllGranted('PERM_READ_ORDER')}" />
 			</menupopup>
 		</menu>
 		<menu label="${labels.BussinessTrips}">
@@ -37,11 +41,13 @@
 				<menuitem
 					image="/img/req-trip-016.png"
 					label="${labels.CurrentRequirements}"
-					href="/main/trips/requirements/" />
+					href="/main/trips/requirements/"
+					disabled="${not sec:isAllGranted('PERM_READ_TRIPREQUIREMENTS')}" />
 				<menuitem
 					image="/img/pickup-024.png"
 					label="${labels.TravelOrders}"
-					href="/main/trips/bill" />
+					href="/main/trips/bill"
+					disabled="${not sec:isAllGranted('PERM_READ_TRIPBILL')}" />
 			</menupopup>
 		</menu>
 		<menuseparator />
@@ -89,7 +95,7 @@
 				<menuitem
 					label="${labels.NumberSeries}…"
 					onClick="@command('numSeries')"
-					disabled="${not sec:isAllGranted('ROLE_ADMIN')}"/>
+					disabled="${not sec:isAllGranted('ROLE_ADMIN')}" />
 				<menu label="${labels.Administration}">
 					<menupopup>
 						<menuitem
diff --git a/src/main/webapp/main/orders/approved/grid.zul b/src/main/webapp/main/orders/approved/grid.zul
index 09653dc2..e18d6057 100644
--- a/src/main/webapp/main/orders/approved/grid.zul
+++ b/src/main/webapp/main/orders/approved/grid.zul
@@ -1,4 +1,5 @@
 <?page title="${labels.ApprovedRequirementItems}" contentType="text/html;charset=UTF-8"?>
+<?taglib uri="/WEB-INF/security.tld" prefix="sec"?>
 <zk>
 	<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
 	<window
@@ -277,7 +278,8 @@
 			<menuitem
 				image="/img/autotruck-016.png"
 				label="${labels.CreateOrder}..."
-				onClick="@command('onCreateOrder')" />
+				onClick="@command('onCreateOrder')"
+				disabled="${not sec:isAllGranted('PERM_READ_ORDER')}" />
 		</menupopup>
 	</window>
 </zk>
\ No newline at end of file