From f57dbf19485e1da5f9a60d65b0c4cc8ce6e4cd9c Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Wed, 5 Mar 2014 08:35:19 +0100
Subject: config gui fixes

---
 id/ConfigWebTool/src/main/webapp/js/common.js          | 15 +++++++++------
 id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'id/ConfigWebTool/src/main')

diff --git a/id/ConfigWebTool/src/main/webapp/js/common.js b/id/ConfigWebTool/src/main/webapp/js/common.js
index 5fbbdafd1..fef368b0a 100644
--- a/id/ConfigWebTool/src/main/webapp/js/common.js
+++ b/id/ConfigWebTool/src/main/webapp/js/common.js
@@ -45,21 +45,21 @@ function oaSSOService() {
 	}
 }
 function oaStork() {
-	if ($('#OAuseSTORKLogon').attr('checked') == 'checked') {
+	if ($('#OAuseSTORKLogon').is(':checked')) {
 		$('#stork_block').css('display', "block");
 	} else {
 		$('#stork_block').css('display', "none");
 	}
 }
 function oaVIDP() {
-	if ($('#oa_vidp_area').css('display') == "block") {
-		$('#oa_vidp_area').css('display', "none");
-		$('#button_vidp_show').css('display', "block");
-		$('#button_vidp_hidden').css('display', "none");
-	} else {
+	if ($('#oa_vidp_area').css('display') == "none" || $('#OAuseVidp').is(':checked')) {
 		$('#oa_vidp_area').css('display', "block");
 		$('#button_vidp_show').css('display', "none");
 		$('#button_vidp_hidden').css('display', "block");
+	} else {
+		$('#oa_vidp_area').css('display', "none");
+		$('#button_vidp_show').css('display', "block");
+		$('#button_vidp_hidden').css('display', "none");
 	}
 }
 function oaSAML1() {
@@ -201,9 +201,12 @@ function oaOnLoad() {
 	oaBusinessService();
 	oaSSOService();
 	oaLegacyService();
+	oaStork();
 	AdminTarget();
 	oaTargetSubSector();
 	
+	oaVIDP();
+	
 	$(".colorfield").each(
 		function() {
 			$(this).ColorPicker({
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
index 1f42bf092..76c347445 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -505,7 +505,7 @@
 						</div>
 						
 											
-						<div id="oa_vidp_area" class="oa_protocol_area hidden">
+						<div id="oa_vidp_area" class="oa_protocol_area">
 							<h4><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.header", request) %></h4>
 	
 							<p><s:checkbox name="storkOA.vidpEnabled" 
-- 
cgit v1.2.3


From 1ba3c2042e0c4da08af39db6172ff1206dfece36 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Wed, 5 Mar 2014 10:22:46 +0100
Subject: ap plugins can be configured to listen to certain attributes

---
 .../moa/id/configuration/validation/oa/OASTORKConfigValidation.java  | 4 ++++
 id/ConfigWebTool/src/main/resources/applicationResources.properties  | 1 +
 id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp               | 5 +++--
 3 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'id/ConfigWebTool/src/main')

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OASTORKConfigValidation.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OASTORKConfigValidation.java
index 25e0d751c..067e85aa6 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OASTORKConfigValidation.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OASTORKConfigValidation.java
@@ -58,6 +58,10 @@ public class OASTORKConfigValidation {
 				log.info("AttributeProviderPlugin Name is empty.");
 				errors.add(LanguageHelper.getErrorString("validation.stork.ap.name.valid"));
 			}
+			if (MiscUtil.isEmpty(current.getAttributes()) || !current.getAttributes().matches("[a-zA-Z]+(, ?[a-zA-Z]+)*")) {
+				log.info("AttributeProviderPlugin attributes are empty or do not match csv format.");
+				errors.add(LanguageHelper.getErrorString("validation.stork.ap.attributes.valid"));
+			}
 		}
 
 		return errors;
diff --git a/id/ConfigWebTool/src/main/resources/applicationResources.properties b/id/ConfigWebTool/src/main/resources/applicationResources.properties
index a033205ed..34bf4a8e5 100644
--- a/id/ConfigWebTool/src/main/resources/applicationResources.properties
+++ b/id/ConfigWebTool/src/main/resources/applicationResources.properties
@@ -419,6 +419,7 @@ validation.stork.qaa.outofrange=G\u00FCltige QAA Werte sind 1, 2, 3, und 4
 validation.stork.attributes.empty=Es muss mindestens ein Attribut definiert sein
 validation.stork.ap.url.valid=Ung\u00FCltige AttributProvider Url
 validation.stork.ap.name.valid=Ung\u00FCltiger AttributProvider Name
+validation.stork.ap.attributes.valid=Ung\u00FCltige Attributconfiguration f\u00FCr ein Attribut Provider Plugin. Feld darf nicht leer sein und ist als csv anzugeben.
 
 validation.pvp2.metadataurl.empty=Keine Metadaten URL angegeben.
 validation.pvp2.metadataurl.valid=Die Metadaten URL wei\u00DFt kein g\u00FCltiges URL Format auf.
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
index 76c347445..5ee1188ae 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -516,10 +516,11 @@
 								id="OAuseVidp" /></p>
 							<h5><%=LanguageHelper.getGUIString("webpages.oaconfig.vidp.ap.list", request) %></h5>
 							<table id="stork_aplist">
-								<tr><th>AP Plugin</th><th>URL</th>
+								<tr><th>AP Plugin</th><th>URL</th><th>Attribute (CSV)</th></tr>
 								<s:iterator value="storkOA.attributeProviderPlugins" status="stat">
 								  <tr><td><s:select name="storkOA.attributeProviderPlugins[%{#stat.index}].name" value="%{name}" list="%{storkOA.availableAttributeProviderPlugins}"/></td>
-								      <td><s:textfield name="storkOA.attributeProviderPlugins[%{#stat.index}].url" value="%{url}" cssClass="textfield"/></td>
+								      <td><s:textfield name="storkOA.attributeProviderPlugins[%{#stat.index}].url" value="%{url}" cssClass="textfield_mail"/></td>
+								      <td><s:textfield name="storkOA.attributeProviderPlugins[%{#stat.index}].attributes" value="%{attributes}" cssClass="textfield_mail"/></td>
 								      <td><input type="button" value="<%=LanguageHelper.getGUIString("webpages.oaconfig.vidp.ap.remove", request) %>" onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/></td></tr>
 								</s:iterator>
 							</table>
-- 
cgit v1.2.3