From 6ac6d783fb3947413dc1af54b4a89069d13b285a Mon Sep 17 00:00:00 2001
From: Josef Rokos <pepa@bukova.info>
Date: Mon, 19 Oct 2015 10:24:53 +0200
Subject: [PATCH] =?UTF-8?q?-=20Opravena=20kontrola=20pr=C3=A1v=20p=C5=99i?=
 =?UTF-8?q?=20ru=C5=BEen=C3=AD=20schv=C3=A1len=C3=AD=20vy=C3=BA=C4=8Dtov?=
 =?UTF-8?q?=C3=A1n=C3=AD=20SC.=20-=20Opraven=20refresh=20grid=C5=AF=20p?=
 =?UTF-8?q?=C5=99i=20maz=C3=A1n=C3=AD=20z=C3=A1znam=C5=AF.=20-=20Zru=C5=A1?=
 =?UTF-8?q?eno=20v=C3=BDchoz=C3=AD=20t=C5=99=C3=ADd=C4=9Bn=C3=AD=20v=20age?=
 =?UTF-8?q?nd=C4=9B=20Cestovn=C3=AD=20p=C5=99=C3=ADkazy.=20-=20Opraven=20p?=
 =?UTF-8?q?om.xml.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                         | 1 +
 .../isspst/services/tripbill/TripBillApprovalServiceImpl.java   | 2 +-
 src/main/java/info/bukova/isspst/ui/ListViewModel.java          | 1 -
 src/main/webapp/app/template.zhtml                              | 2 +-
 src/main/webapp/main/trips/bill/tripBillGridInt.zul             | 1 -
 5 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0380a74c..0f1d7929 100644
--- a/pom.xml
+++ b/pom.xml
@@ -420,6 +420,7 @@
 				<directory>src/main/resources</directory>
 				<includes>
 					<include>**/*.xml</include>
+					<include>**/*.properties</include>
 				</includes>
 			</resource>
 		</resources>
diff --git a/src/main/java/info/bukova/isspst/services/tripbill/TripBillApprovalServiceImpl.java b/src/main/java/info/bukova/isspst/services/tripbill/TripBillApprovalServiceImpl.java
index 3e92cd03..0406a0db 100644
--- a/src/main/java/info/bukova/isspst/services/tripbill/TripBillApprovalServiceImpl.java
+++ b/src/main/java/info/bukova/isspst/services/tripbill/TripBillApprovalServiceImpl.java
@@ -69,7 +69,7 @@ public class TripBillApprovalServiceImpl extends RequirementBaseServiceImpl<Trip
 
 	@Override
 	@Transactional
-	@PreAuthorize("this.canApprove(#bill.approval)")
+	@PreAuthorize("hasPermission(this, 'PERM_DELETE') or this.canApprove(#bill.approval)")
 	public void cancelApproval(TripBill bill) {
 		bill.setApproval(null);
 		signedDocumentService.deleteForEntity(bill);
diff --git a/src/main/java/info/bukova/isspst/ui/ListViewModel.java b/src/main/java/info/bukova/isspst/ui/ListViewModel.java
index 6872e665..1d63fe89 100644
--- a/src/main/java/info/bukova/isspst/ui/ListViewModel.java
+++ b/src/main/java/info/bukova/isspst/ui/ListViewModel.java
@@ -184,7 +184,6 @@ public class ListViewModel<T extends DataModel> extends DocumentViewModel
 	}
 
 	@Command
-	@NotifyChange({ "dataList", "dataBean" })
 	public void delete() {
 		Messagebox.show(StringUtils.localize("DbReallyDelete"), StringUtils.localize("DbDeleteRecord"), Messagebox.YES
 				| Messagebox.NO, Messagebox.QUESTION,
diff --git a/src/main/webapp/app/template.zhtml b/src/main/webapp/app/template.zhtml
index 7fa7cdbd..7db51024 100644
--- a/src/main/webapp/app/template.zhtml
+++ b/src/main/webapp/app/template.zhtml
@@ -51,6 +51,6 @@
 		<div id="mainData">
 			<u:include src="${gridZul}" />
 		</div>
-		<div id="footer"> Verze 2.0 </div>
+		<div id="footer"> Verze 3.1 </div>
 	</div>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/main/trips/bill/tripBillGridInt.zul b/src/main/webapp/main/trips/bill/tripBillGridInt.zul
index 7374a463..daa24fe5 100644
--- a/src/main/webapp/main/trips/bill/tripBillGridInt.zul
+++ b/src/main/webapp/main/trips/bill/tripBillGridInt.zul
@@ -18,7 +18,6 @@
 				<listheader
 						label="${labels.TravelOrdersGridNumser}"
 						sort="czech(bill.requirement.numser)"
-						onCreate="self.sort(false)"
 						width="30%" />
 				<listheader
 						label="${labels.TravelOrdersGridReqDate}"