selection gets reported to config

2 files changed, 18 insertions, 8 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
index c9d4fc2ee..12d7faac6 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
@@ -49,7 +49,8 @@ public class OASTORKConfig {
 	private boolean vidpEnabled = false;
 	private List<AttributeProviderPlugin> attributeProviderPlugins = new ArrayList<AttributeProviderPlugin>();
 	private boolean requireConsent = false;
-	private List<CPEPS> citizenCountries;
+	private List<String> citizenCountries;
+	private List<String> enabledCitizenCountries;
 	
 	public OASTORKConfig() {
 		
@@ -76,9 +77,12 @@ public class OASTORKConfig {
 				}
 				
 				// fetch available citizen countries
-				citizenCountries = new ArrayList<CPEPS>(ConfigurationDBRead.getMOAIDConfiguration().getAuthComponentGeneral().getForeignIdentities().getSTORK().getCPEPS());
-				
-				
+//				citizenCountries = new ArrayList<CPEPS>(ConfigurationDBRead.getMOAIDConfiguration().getAuthComponentGeneral().getForeignIdentities().getSTORK().getCPEPS());
+				citizenCountries = new ArrayList<String>();
+				for(CPEPS current : ConfigurationDBRead.getMOAIDConfiguration().getAuthComponentGeneral().getForeignIdentities().getSTORK().getCPEPS()) {
+					citizenCountries.add(current.getCountryCode());
+				}
+				enabledCitizenCountries = new ArrayList<String>(citizenCountries.subList(2, 4));
 
 				// prepare attribute helper list
 				attributes = new ArrayList<AttributeHelper>();
@@ -160,10 +164,18 @@ public class OASTORKConfig {
 		this.attributes = attributes;
 	}
 	
-	public List<CPEPS> getAvailableCitizenCountries() {
+	public List<String> getAvailableCitizenCountries() {
 		return citizenCountries;
 	}
 	
+	public List<String> getEnabledCitizenCountries() {
+		return enabledCitizenCountries;
+	}
+	
+	public void setEnabledCitizenCountries(List<String> update) {
+		enabledCitizenCountries = update;
+	}
+	
 	public List<String> getAvailableAttributeProviderPlugins() {
 		return AttributeProviderFactory.getAvailablePlugins();
 	}
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
index ac433a47a..cd3eca67d 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -389,9 +389,7 @@
 								key="webpages.moaconfig.stork.qaa"
 								labelposition="left" />
 							<h4>w&auml;hlbare Ziell&auml;nder</h4>
-							<s:iterator value="storkOA.availableCitizenCountries">
-								<s:checkbox name="%{countryCode}" label="%{countryCode}" labelposition="left"/>
-							</s:iterator>
+							<s:checkboxlist name="storkOA.enabledCitizenCountries" list="storkOA.availableCitizenCountries" value="storkOA.enabledCitizenCountries" />
 							<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.attributes.header", request) %></h4>
 							<table>
 								<tr><th><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.attributes.used", request) %></th>