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

Conflicts: src/main/java/info/bukova/isspst/AppInitListener.java src/main/resources/hibernate.cfg.xml
2014-06-30 07:53:58 +02:00
parent 177e29fe23 90fe32e262
commit a074dd376d
21 changed files with 540 additions and 18 deletions
@@ -37,6 +37,7 @@
 		</tabpanel>
 		<tabpanel>
 			<menubar orient="vertical">
+				<menuitem label="${labels.AgendaWorkflow}" href="/settings/workflow" disabled="${not sec:isAllGranted('PERM_EDIT_WORKFLOW')}"/>
 				<menuitem label="Limity částek"/>
 				<menuitem label="E-maily" />
 			</menubar>