From e16786eda4773a4f5bd91bc76cefa4c08a8d44e6 Mon Sep 17 00:00:00 2001
From: Josef Rokos <pepa@bukova.info>
Date: Mon, 29 Sep 2014 15:42:28 +0200
Subject: [PATCH 1/2] =?UTF-8?q?Opravena=20editace=20glob=C3=A1ln=C3=ADho?=
 =?UTF-8?q?=20nastaven=C3=AD-=20pokud=20u=C5=BEivatel=20nem=C3=A1=20pr?=
 =?UTF-8?q?=C3=A1va=20k=20editaci,=20vid=C3=AD=20nastaven=C3=AD=20jako=20r?=
 =?UTF-8?q?ead=20only.=20closes=20#141?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../isspst/ui/settings/GlobalSettingsVM.java  |  4 ++-
 src/main/webapp/settings/global/address.zul   | 26 +++++++++----------
 src/main/webapp/settings/global/bank.zul      |  6 ++---
 src/main/webapp/settings/global/email.zul     | 21 ++++++++-------
 .../webapp/settings/global/travelOrders.zul   | 16 ++++++------
 src/main/webapp/settings/globalSettings.zul   |  2 +-
 6 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/src/main/java/info/bukova/isspst/ui/settings/GlobalSettingsVM.java b/src/main/java/info/bukova/isspst/ui/settings/GlobalSettingsVM.java
index 4e5db21c..2dca91f7 100644
--- a/src/main/java/info/bukova/isspst/ui/settings/GlobalSettingsVM.java
+++ b/src/main/java/info/bukova/isspst/ui/settings/GlobalSettingsVM.java
@@ -1,5 +1,6 @@
 package info.bukova.isspst.ui.settings;
 
+import info.bukova.isspst.Constants;
 import info.bukova.isspst.data.Address;
 import info.bukova.isspst.data.Requirement;
 import info.bukova.isspst.data.SettingsData;
@@ -8,6 +9,7 @@ import info.bukova.isspst.mail.MailMessage;
 import info.bukova.isspst.services.settings.GlobalSettingsService;
 import info.bukova.isspst.sort.ReflectionTools;
 import info.bukova.isspst.ui.LocaleConverter;
+import info.bukova.isspst.ui.SecurityHelper;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -52,7 +54,7 @@ public class GlobalSettingsVM {
 	}
 	
 	public boolean isCanSave() {
-		return true;
+		return SecurityHelper.isAllGranted(Constants.ROLE_ADMIN);
 	}
 
 	public LocaleConverter getLocConverter() {
diff --git a/src/main/webapp/settings/global/address.zul b/src/main/webapp/settings/global/address.zul
index bad5eb7d..70dbf9d9 100644
--- a/src/main/webapp/settings/global/address.zul
+++ b/src/main/webapp/settings/global/address.zul
@@ -8,37 +8,37 @@
 					<rows>
 						<row>
 							<label value="${labels.SuppliersFormCompany}"/>
-							<textbox value="@bind(vm.settings.mainAddress.company)" width="100%"/>
+							<textbox value="@bind(vm.settings.mainAddress.company)" width="100%" readonly="@load(not vm.canSave)"/>
 						</row>
 						<row>
 							<label value="${labels.SuppliersFormIC}"/>
-							<textbox value="@bind(vm.settings.mainAddress.ic)"/>
+							<textbox value="@bind(vm.settings.mainAddress.ic)" readonly="@load(not vm.canSave)"/>
 						</row>
 						<row>
 							<label value="${labels.SuppliersFormDIC}"/>
-							<textbox value="@bind(vm.settings.mainAddress.dic)"/>
+							<textbox value="@bind(vm.settings.mainAddress.dic)" readonly="@load(not vm.canSave)"/>
 						</row>
 						<row>
 							<label value="${labels.SuppliersFormStreet}"/>
-							<textbox value="@bind(vm.settings.mainAddress.street)" width="100%"/>
+							<textbox value="@bind(vm.settings.mainAddress.street)" width="100%" readonly="@load(not vm.canSave)"/>
 						</row>
 						<row>
 							<label value="${labels.SuppliersFormNo}"/>
-							<textbox value="@bind(vm.settings.mainAddress.houseNumber)"/>
+							<textbox value="@bind(vm.settings.mainAddress.houseNumber)" readonly="@load(not vm.canSave)"/>
 						</row>
 						<row>
 							<label value="${labels.SuppliersFormCity}"/>
-							<textbox value="@bind(vm.settings.mainAddress.city)" width="100%"/>
+							<textbox value="@bind(vm.settings.mainAddress.city)" width="100%" readonly="@load(not vm.canSave)"/>
 						</row>
 						<row>
 							<label value="${labels.SuppliersFormZIP}"/>
-							<textbox value="@bind(vm.settings.mainAddress.zipCode)"/>
+							<textbox value="@bind(vm.settings.mainAddress.zipCode)" readonly="@load(not vm.canSave)"/>
 						</row>
 					</rows>
 				</grid>
 				<vbox>
 					<label value="${labels.ShippingAddresses}"/>
-					<button label="${labels.AddItem}" onClick="@command('addAddress')"/>
+					<button label="${labels.AddItem}" onClick="@command('addAddress')" disabled="@load(not vm.canSave)"/>
 					<listbox model="@load(vm.settings.shippingAddrs)">
 						<listhead>
 							<listheader label="${labels.SuppliersFormStreet}"/>
@@ -50,19 +50,19 @@
 						<template name="model">
 							<listitem>
 								<listcell>
-									<textbox inplace="true" value="@bind(each.street)"></textbox>
+									<textbox inplace="true" value="@bind(each.street)" readonly="@load(not vm.canSave)"></textbox>
 								</listcell>
 								<listcell>
-									<textbox inplace="true" value="@bind(each.houseNumber)"></textbox>
+									<textbox inplace="true" value="@bind(each.houseNumber)" readonly="@load(not vm.canSave)"></textbox>
 								</listcell>
 								<listcell>
-									<textbox inplace="true" value="@bind(each.city)"></textbox>
+									<textbox inplace="true" value="@bind(each.city)" readonly="@load(not vm.canSave)"></textbox>
 								</listcell>
 								<listcell>
-									<textbox inplace="true" value="@bind(each.zipCode)"></textbox>
+									<textbox inplace="true" value="@bind(each.zipCode)" readonly="@load(not vm.canSave)"></textbox>
 								</listcell>
 								<listcell>
-									<button label="${labels.RemoveItem }" onClick="@command('removeAddress', addr=each)"/>
+									<button label="${labels.RemoveItem }" onClick="@command('removeAddress', addr=each)" disabled="@load(not vm.canSave)"/>
 								</listcell>
 							</listitem>
 						</template>
diff --git a/src/main/webapp/settings/global/bank.zul b/src/main/webapp/settings/global/bank.zul
index 80cc0957..6dd60c24 100644
--- a/src/main/webapp/settings/global/bank.zul
+++ b/src/main/webapp/settings/global/bank.zul
@@ -8,15 +8,15 @@
 					<rows>
 						<row>
 							<label value="${labels.BankName}"/>
-							<textbox value="@bind(vm.settings.bankName)" width="100%"/>
+							<textbox value="@bind(vm.settings.bankName)" width="100%" readonly="@load(not vm.canSave)"/>
 						</row>
 						<row>
 							<label value="${labels.AccountNumber}"/>
-							<textbox value="@bind(vm.settings.accountNumber)"/>
+							<textbox value="@bind(vm.settings.accountNumber)" readonly="@load(not vm.canSave)"/>
 						</row>
 						<row>
 							<label value="${labels.BankCode}"/>
-							<textbox value="@bind(vm.settings.bankCode)"/>
+							<textbox value="@bind(vm.settings.bankCode)" readonly="@load(not vm.canSave)"/>
 						</row>
 					</rows>
 				</grid>
diff --git a/src/main/webapp/settings/global/email.zul b/src/main/webapp/settings/global/email.zul
index f2ba5086..d2e3f9e4 100644
--- a/src/main/webapp/settings/global/email.zul
+++ b/src/main/webapp/settings/global/email.zul
@@ -15,12 +15,13 @@
 								</columns>
 								<rows>
 									<row>
-										<label value="${labels.MailSubject}"/> <textbox value="@bind(vm.settings.newReqTemplate.subject)" width="100%"/>
+										<label value="${labels.MailSubject}"/> <textbox value="@bind(vm.settings.newReqTemplate.subject)" width="100%" readonly="@load(not vm.canSave)"/>
 									</row>
 									<row spans="2">
 										<vbox>
-											<ckeditor toolbar="Basic" value="@bind(vm.settings.newReqTemplate.text)" width="460px" height="180px"/>
-											<button label="${labels.InsertField}" popup="fieldsNew, position=after_start"/>
+											<ckeditor toolbar="Basic" value="@bind(vm.settings.newReqTemplate.text)" width="460px" height="180px" if="${vm.canSave}"/>
+											<html content="@load(vm.settings.newReqTemplate.text)" width="460px" height="180px" if="${not vm.canSave}"/>
+											<button label="${labels.InsertField}" popup="fieldsNew, position=after_start" disabled="@load(not vm.canSave)"/>
 										</vbox>
 									</row>
 								</rows>
@@ -34,12 +35,13 @@
 								</columns>
 								<rows>
 									<row>
-										<label value="${labels.MailSubject}"/> <textbox value="@bind(vm.settings.authReqTemplate.subject)" width="100%"/>
+										<label value="${labels.MailSubject}"/> <textbox value="@bind(vm.settings.authReqTemplate.subject)" width="100%" readonly="@load(not vm.canSave)"/>
 									</row>
 									<row spans="2">
 										<vbox>
-											<ckeditor toolbar="Basic" value="@bind(vm.settings.authReqTemplate.text)" width="460px" height="180px"/>
-											<button label="${labels.InsertField}" popup="fieldsAuth, position=after_start"/>
+											<ckeditor toolbar="Basic" value="@bind(vm.settings.authReqTemplate.text)" width="460px" height="180px" if="${vm.canSave}" />
+											<html content="@load(vm.settings.authReqTemplate.text)" width="460px" height="180px" if="${not vm.canSave}"/>
+											<button label="${labels.InsertField}" popup="fieldsAuth, position=after_start" disabled="@load(not vm.canSave)"/>
 										</vbox>
 									</row>
 								</rows>
@@ -53,12 +55,13 @@
 								</columns>
 								<rows>
 									<row>
-										<label value="${labels.MailSubject}"/> <textbox value="@bind(vm.settings.confReqTemplate.subject)" width="100%"/>
+										<label value="${labels.MailSubject}"/> <textbox value="@bind(vm.settings.confReqTemplate.subject)" width="100%" readonly="@load(not vm.canSave)"/>
 									</row>
 									<row spans="2">
 										<vbox>
-											<ckeditor toolbar="Basic" value="@bind(vm.settings.confReqTemplate.text)" width="460px" height="180px"/>
-											<button label="${labels.InsertField}" popup="fieldsConfirm, position=after_start"/>
+											<ckeditor toolbar="Basic" value="@bind(vm.settings.confReqTemplate.text)" width="460px" height="180px" if="${vm.canSave}" />
+											<html content="@load(vm.settings.confReqTemplate.text)" width="460px" height="180px" if="${not vm.canSave}"/>
+											<button label="${labels.InsertField}" popup="fieldsConfirm, position=after_start" disabled="@load(not vm.canSave)"/>
 										</vbox>
 									</row>
 								</rows>
diff --git a/src/main/webapp/settings/global/travelOrders.zul b/src/main/webapp/settings/global/travelOrders.zul
index fef2a3d4..6f8fc539 100644
--- a/src/main/webapp/settings/global/travelOrders.zul
+++ b/src/main/webapp/settings/global/travelOrders.zul
@@ -23,10 +23,10 @@
 					<template name="model">
 						<row>
 							<label value="@load(each)"/>
-							<textbox value="@bind(vm.settings.refunds[each][0])" inplace="true"/>
-							<textbox value="@bind(vm.settings.refunds[each][1])" inplace="true"/>
-							<textbox value="@bind(vm.settings.refunds[each][2])" inplace="true"/>
-							<textbox value="@bind(vm.settings.refunds[each][3])" inplace="true"/>
+							<textbox value="@bind(vm.settings.refunds[each][0])" inplace="true" readonly="@load(not vm.canSave)"/>
+							<textbox value="@bind(vm.settings.refunds[each][1])" inplace="true" readonly="@load(not vm.canSave)"/>
+							<textbox value="@bind(vm.settings.refunds[each][2])" inplace="true" readonly="@load(not vm.canSave)"/>
+							<textbox value="@bind(vm.settings.refunds[each][3])" inplace="true" readonly="@load(not vm.canSave)"/>
 						</row>
 						
 					</template>
@@ -35,7 +35,7 @@
 		</tabpanel>
 		<tabpanel>
 			<vbox>
-				<button label="${labels.AddItem}" onClick="@command('addVehicle')" sclass="nicebutton"/>
+				<button label="${labels.AddItem}" onClick="@command('addVehicle')" sclass="nicebutton" disabled="@load(not vm.canSave)"/>
 				<grid model="@load(vm.settings.vehicles)">
 					<columns>
 						<column label="${labels.code}"/>
@@ -45,9 +45,9 @@
 					<rows>
 						<template name="model">
 							<row>
-								<textbox inplace="true" value="@bind(each.code)"/>
-								<textbox inplace="true" value="@bind(each.description)"/>
-								<button label="${labels.RemoveItem}" onClick="@command('removeVehicle', vehicle=each)"/>
+								<textbox inplace="true" value="@bind(each.code)" readonly="@load(not vm.canSave)"/>
+								<textbox inplace="true" value="@bind(each.description)" readonly="@load(not vm.canSave)"/>
+								<button label="${labels.RemoveItem}" onClick="@command('removeVehicle', vehicle=each)" disabled="@load(not vm.canSave)"/>
 							</row>
 						</template>
 					</rows>
diff --git a/src/main/webapp/settings/globalSettings.zul b/src/main/webapp/settings/globalSettings.zul
index 14b45da8..e192a3fc 100644
--- a/src/main/webapp/settings/globalSettings.zul
+++ b/src/main/webapp/settings/globalSettings.zul
@@ -28,7 +28,7 @@
 					<div>
 						<checkbox
 							label="${labels.EnableRequirements}"
-							checked="@bind(vm.settings.enableRequirements)" />
+							checked="@bind(vm.settings.enableRequirements)" disabled="@load(not vm.canSave)" />
 					</div>
 				</tabpanel>
 				<tabpanel>

From b89519e3ca0e9bb3afcbbf01d7372ed4f551acb1 Mon Sep 17 00:00:00 2001
From: Josef Rokos <pepa@bukova.info>
Date: Mon, 29 Sep 2014 22:20:46 +0200
Subject: [PATCH 2/2] =?UTF-8?q?P=C5=99id=C3=A1na=20podpora=20pro=20v=C3=BD?=
 =?UTF-8?q?b=C4=9Br=20z=C3=A1znamu=20v=20gridu=20p=C5=99es=20ID=20p=C5=99e?=
 =?UTF-8?q?dan=C3=A9=20jako=20parametr=20"select"=20v=20URL.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../isspst/security/LoginSuccessHandler.java  |  5 +-
 .../info/bukova/isspst/ui/ListViewModel.java  | 30 +++++++++++-
 .../bukova/isspst/ui/main/TabPanelsVM.java    | 49 ++++++++++++++++++-
 .../orders/requirements/ReqListMyAll.java     |  5 ++
 .../orders/requirements/ReqListMyCenters.java |  5 ++
 .../requirements/ReqListMyWorkgroups.java     |  5 ++
 .../requirement/TripRequirementListAll.java   |  5 ++
 .../TripRequirementListCentre.java            |  5 ++
 .../TripRequirementListWorkgroup.java         |  5 ++
 src/main/webapp/main/tabPanels.zul            |  9 ++--
 10 files changed, 116 insertions(+), 7 deletions(-)

diff --git a/src/main/java/info/bukova/isspst/security/LoginSuccessHandler.java b/src/main/java/info/bukova/isspst/security/LoginSuccessHandler.java
index d237ad96..2d16b541 100644
--- a/src/main/java/info/bukova/isspst/security/LoginSuccessHandler.java
+++ b/src/main/java/info/bukova/isspst/security/LoginSuccessHandler.java
@@ -22,8 +22,9 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
+import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
 
-public class LoginSuccessHandler implements AuthenticationSuccessHandler {
+public class LoginSuccessHandler extends SavedRequestAwareAuthenticationSuccessHandler implements AuthenticationSuccessHandler {
 	
 	@Autowired
 	private SessionData sessionData;
@@ -61,7 +62,7 @@ public class LoginSuccessHandler implements AuthenticationSuccessHandler {
 			userService.update(u);
 		}
 		
-		response.sendRedirect("app/");
+		super.onAuthenticationSuccess(request, response, auth);
 	}
 
 }
diff --git a/src/main/java/info/bukova/isspst/ui/ListViewModel.java b/src/main/java/info/bukova/isspst/ui/ListViewModel.java
index 008789cc..c41677ad 100644
--- a/src/main/java/info/bukova/isspst/ui/ListViewModel.java
+++ b/src/main/java/info/bukova/isspst/ui/ListViewModel.java
@@ -10,6 +10,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.security.access.AccessDeniedException;
 import org.zkoss.bind.BindUtils;
@@ -44,7 +46,7 @@ public class ListViewModel<T extends DataModel> {
 	protected Class<T> dataClass;
 	protected String formZul;
 	protected Filter<T> dataFilter;
-
+	
 	public List<T> getDataList() {
 		if (dataList == null) {
 			dataList = new ArrayList<T>();
@@ -266,10 +268,36 @@ public class ListViewModel<T extends DataModel> {
 			newRec = false;
 		}
 		
+		Map<String, String[]> map = Executions.getCurrent().getParameterMap();
+		int id = -1;
+		
+		try {
+			if (map.get("select") != null) {
+				id = Integer.parseInt(map.get("select")[0]);
+			}
+		} catch (NumberFormatException e) {
+			Logger logger = LoggerFactory.getLogger(this.getClass());
+			logger.warn("ID is not number: " + map.get("select")[0]);
+		}
+		
+		if (id > 0) {
+			for (int i = 0; i < dataList.size(); i++) {
+				if (dataList.get(i).getId() == id) {
+					selIndex = i;
+					beforeSelectViaUrl();
+					break;
+				}
+			}
+		}
+		
 		if (selIndex > -1) {
 			this.setDataBean(dataList.get(selIndex));
 		}
 	}
+	
+	protected void beforeSelectViaUrl() {
+
+	}
 
 	@Command
 	@NotifyChange("dataBean")
diff --git a/src/main/java/info/bukova/isspst/ui/main/TabPanelsVM.java b/src/main/java/info/bukova/isspst/ui/main/TabPanelsVM.java
index ab16deed..dc047eb2 100644
--- a/src/main/java/info/bukova/isspst/ui/main/TabPanelsVM.java
+++ b/src/main/java/info/bukova/isspst/ui/main/TabPanelsVM.java
@@ -9,6 +9,10 @@ public class TabPanelsVM
 	private boolean showCentre;
 	private boolean showWorkgroup;
 	private boolean showAll;
+	private boolean selectMy;
+	private boolean selectCentre;
+	private boolean selectWorkgroup;
+	private boolean selectAll;
 
 	@Init
 	public void init()
@@ -16,8 +20,13 @@ public class TabPanelsVM
 		showCentre = true;
 		showWorkgroup = true;
 		showAll = true;
+		
+		selectMy = true;       
+		selectCentre = false;   
+		selectWorkgroup = false;
+		selectAll = false;
 	}
-
+	
 	@GlobalCommand
 	@NotifyChange("showCentre")
 	public void disableCentre()
@@ -38,6 +47,27 @@ public class TabPanelsVM
 	{
 		showAll = false;
 	}
+	
+	@GlobalCommand
+	@NotifyChange("selectCentre")
+	public void selectCentre() {
+		selectMy = false;
+		selectCentre = true;
+	}
+	
+	@GlobalCommand
+	@NotifyChange("selectWorkgroup")
+	public void selectWorkgroup() {
+		selectMy = false;
+		selectWorkgroup = true;
+	}
+	
+	@GlobalCommand
+	@NotifyChange("selectAll")
+	public void selectAll() {
+		selectMy = false;
+		selectAll = true;
+	}
 
 	public boolean isShowCentre()
 	{
@@ -53,4 +83,21 @@ public class TabPanelsVM
 	{
 		return showAll;
 	}
+
+	public boolean isSelectMy() {
+		return selectMy;
+	}
+
+	public boolean isSelectCentre() {
+		return selectCentre;
+	}
+
+	public boolean isSelectWorkgroup() {
+		return selectWorkgroup;
+	}
+
+	public boolean isSelectAll() {
+		return selectAll;
+	}
+	
 }
diff --git a/src/main/java/info/bukova/isspst/ui/main/orders/requirements/ReqListMyAll.java b/src/main/java/info/bukova/isspst/ui/main/orders/requirements/ReqListMyAll.java
index 9448cb95..5ffc7f2f 100644
--- a/src/main/java/info/bukova/isspst/ui/main/orders/requirements/ReqListMyAll.java
+++ b/src/main/java/info/bukova/isspst/ui/main/orders/requirements/ReqListMyAll.java
@@ -64,4 +64,9 @@ public class ReqListMyAll extends RequirementSubpage<Requirement>
 	{
 		this.reload();
 	}
+	
+	@Override
+	protected void beforeSelectViaUrl() {
+		BindUtils.postGlobalCommand(null, null, "selectAll", null);
+	}
 }
diff --git a/src/main/java/info/bukova/isspst/ui/main/orders/requirements/ReqListMyCenters.java b/src/main/java/info/bukova/isspst/ui/main/orders/requirements/ReqListMyCenters.java
index 0ca89e74..737d67c4 100644
--- a/src/main/java/info/bukova/isspst/ui/main/orders/requirements/ReqListMyCenters.java
+++ b/src/main/java/info/bukova/isspst/ui/main/orders/requirements/ReqListMyCenters.java
@@ -64,4 +64,9 @@ public class ReqListMyCenters extends RequirementSubpage<Requirement>
 	{
 		this.reload();
 	}
+	
+	@Override
+	protected void beforeSelectViaUrl() {
+		BindUtils.postGlobalCommand(null, null, "selectCentre", null);
+	}
 }
diff --git a/src/main/java/info/bukova/isspst/ui/main/orders/requirements/ReqListMyWorkgroups.java b/src/main/java/info/bukova/isspst/ui/main/orders/requirements/ReqListMyWorkgroups.java
index 52ebb05d..568bfd9e 100644
--- a/src/main/java/info/bukova/isspst/ui/main/orders/requirements/ReqListMyWorkgroups.java
+++ b/src/main/java/info/bukova/isspst/ui/main/orders/requirements/ReqListMyWorkgroups.java
@@ -64,4 +64,9 @@ public class ReqListMyWorkgroups extends RequirementSubpage<Requirement>
 	{
 		this.reload();
 	}
+	
+	@Override
+	protected void beforeSelectViaUrl() {
+		BindUtils.postGlobalCommand(null, null, "selectWorkgroup", null);
+	}
 }
diff --git a/src/main/java/info/bukova/isspst/ui/requirement/TripRequirementListAll.java b/src/main/java/info/bukova/isspst/ui/requirement/TripRequirementListAll.java
index 6e0fec74..4d46242c 100644
--- a/src/main/java/info/bukova/isspst/ui/requirement/TripRequirementListAll.java
+++ b/src/main/java/info/bukova/isspst/ui/requirement/TripRequirementListAll.java
@@ -59,5 +59,10 @@ public class TripRequirementListAll extends RequirementSubpage<TripRequirement>
 	public void reloadRelated() {
 		this.reload();
 	}
+	
+	@Override
+	protected void beforeSelectViaUrl() {
+		BindUtils.postGlobalCommand(null, null, "selectAll", null);
+	}
 
 }
diff --git a/src/main/java/info/bukova/isspst/ui/requirement/TripRequirementListCentre.java b/src/main/java/info/bukova/isspst/ui/requirement/TripRequirementListCentre.java
index ba8d87d5..bf50a9c6 100644
--- a/src/main/java/info/bukova/isspst/ui/requirement/TripRequirementListCentre.java
+++ b/src/main/java/info/bukova/isspst/ui/requirement/TripRequirementListCentre.java
@@ -56,5 +56,10 @@ public class TripRequirementListCentre extends RequirementSubpage<TripRequiremen
 	public void reloadRelated() {
 		this.reload();
 	}
+	
+	@Override
+	protected void beforeSelectViaUrl() {
+		BindUtils.postGlobalCommand(null, null, "selectCentre", null);
+	}
 
 }
diff --git a/src/main/java/info/bukova/isspst/ui/requirement/TripRequirementListWorkgroup.java b/src/main/java/info/bukova/isspst/ui/requirement/TripRequirementListWorkgroup.java
index 5b0ef322..7e96eca2 100644
--- a/src/main/java/info/bukova/isspst/ui/requirement/TripRequirementListWorkgroup.java
+++ b/src/main/java/info/bukova/isspst/ui/requirement/TripRequirementListWorkgroup.java
@@ -62,5 +62,10 @@ public class TripRequirementListWorkgroup extends RequirementSubpage<TripRequire
 	public void reloadRelated() {
 		this.reload();
 	}
+	
+	@Override
+	protected void beforeSelectViaUrl() {
+		BindUtils.postGlobalCommand(null, null, "selectWorkgroup", null);
+	}
 
 }
diff --git a/src/main/webapp/main/tabPanels.zul b/src/main/webapp/main/tabPanels.zul
index 011d13a3..b3cf3aeb 100644
--- a/src/main/webapp/main/tabPanels.zul
+++ b/src/main/webapp/main/tabPanels.zul
@@ -6,13 +6,16 @@
 		<tab label="${labels.RequirementsGridMy}" />
 		<tab
 			label="${labels.RequirementsGridMyCentres}"
-			disabled="@load(not vm.showCentre)" />
+			disabled="@load(not vm.showCentre)"
+			selected="@load(vm.selectCentre)" />
 		<tab
 			label="${labels.RequirementsGridMyWorkgroups}"
-			disabled="@load(not vm.showWorkgroup)" />
+			disabled="@load(not vm.showWorkgroup)"
+			selected="@load(vm.selectWorkgroup)" />
 		<tab
 			label="${labels.RequirementsGridAll}"
-			disabled="@load(not vm.showAll)" />
+			disabled="@load(not vm.showAll)"
+			selected="@load(vm.selectAll)" />
 	</tabs>
 	<tabpanels>
 		<tabpanel>