From a25c112bc34957cdaaf7dbb950c229666da52499 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Tue, 15 Jul 2014 12:32:46 +0200
Subject: solve Sub-Target problems in MOA-ID-Configuration

---
 .../data/oa/OATargetConfiguration.java             | 23 ++++++++++++++++++++--
 .../webapp/jsp/snippets/OA/targetConfiguration.jsp |  4 ++--
 pom.xml                                            |  2 +-
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OATargetConfiguration.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OATargetConfiguration.java
index e988cc292..550844700 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OATargetConfiguration.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OATargetConfiguration.java
@@ -83,7 +83,6 @@ public class OATargetConfiguration implements IOnlineApplicationData {
 	@Override
 	public List<String> parse(OnlineApplication dbOA,
 			AuthenticatedUser authUser, HttpServletRequest request) {
-        subTargetSet = MiscUtil.isNotEmpty(getTarget_subsector());
 		
 		String target_full = dbOA.getTarget();
 		if (MiscUtil.isNotEmpty(target_full)) {
@@ -95,8 +94,10 @@ public class OATargetConfiguration implements IOnlineApplicationData {
 				
 				if (TargetValidator.isValidTarget(target_split[0])) {
 					target = target_split[0];
-					if (target_split.length > 1)
+					if (target_split.length > 1) {
 						target_subsector = target_split[1];
+						subTargetSet = true;
+					}
 					
 				} else {
 					target = "";
@@ -367,4 +368,22 @@ public class OATargetConfiguration implements IOnlineApplicationData {
     public void setDeaktivededBusinessService(boolean deaktivededBusinessService) {
         this.deaktivededBusinessService = deaktivededBusinessService;
     }
+
+
+	/**
+	 * @return the subTargetSet
+	 */
+	public boolean isSubTargetSet() {
+		return subTargetSet;
+	}
+
+
+	/**
+	 * @param subTargetSet the subTargetSet to set
+	 */
+	public void setSubTargetSet(boolean subTargetSet) {
+		this.subTargetSet = subTargetSet;
+	}
+    
+    
 }
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp
index 261966a86..b8bd1dc02 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp
@@ -46,8 +46,8 @@
 								</s:select>
 							</s:else>
 							
-							<s:checkbox name="subTargetSet" 
-								value="%{subTargetSet}"
+							<s:checkbox name="targetConfig.subTargetSet" 
+								value="%{targetConfig.subTargetSet}"
 								labelposition="left"
 								key="webpages.oaconfig.general.target.subsector.checkbox"
 								cssClass="checkbox"
diff --git a/pom.xml b/pom.xml
index 2888425d1..27ac723e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
 				<moa-id-version>2.1.0</moa-id-version>
 				<moa-id-proxy-version>2.0.0</moa-id-proxy-version>
         <moa-spss-version>2.0.1</moa-spss-version>
-				<configtool-version>1.1.0</configtool-version>
+				<configtool-version>1.1.0.1</configtool-version>
 				<demo-oa-version>2.0.2</demo-oa-version>
     </properties>
 
-- 
cgit v1.2.3