Merge branch 'master' of https://git.bukova.info/repos/git/isspst

Conflicts: src/main/webapp/app/navigation.zul
2014-06-13 12:20:57 +02:00
parent 2547134420 82055f87c5
commit 6dcc93ee83
42 changed files with 1295 additions and 462 deletions
@@ -46,6 +46,7 @@
 				<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="Střediska" href="/admin/users" disabled="${not sec:isAllGranted('ROLE_ADMIN')}"/>
+				<menuitem label="${labels.AgendaWorkgroups}" href="/workgroups" disabled="${not sec:isAllGranted('PERM_READ_WORKGROUPS')}"/>
 			</menubar>
 		</tabpanel>
 		<tabpanel>