From 4ade7db6124eec07aebf087721d3d478f92bdaad Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Wed, 12 Mar 2014 09:59:19 +0100
Subject: added consent-checkbox to config ui

---
 .../moa/id/configuration/data/oa/OASTORKConfig.java            | 10 ++++++++++
 .../moa/id/configuration/struts/action/EditOAAction.java       |  1 +
 .../src/main/resources/applicationResources.properties         |  1 +
 id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp         |  6 ++++++
 4 files changed, 18 insertions(+)

(limited to 'id/ConfigWebTool')

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 929a3673c..d9f2a4d85 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
@@ -84,6 +84,7 @@ public class OASTORKConfig {
 				
 				// fetch vidp config
 				setVidpEnabled(config.isVidpEnabled());
+				setRequireConsent(config.isRequireConsent());
 
 				attributeProviderPlugins = config.getAttributeProviders();
 				// - if no attribute providers are configured, add a dummy
@@ -150,6 +151,7 @@ public class OASTORKConfig {
 	 */
 	private boolean vidpEnabled = false;
 	private List<AttributeProviderPlugin> attributeProviderPlugins = new ArrayList<AttributeProviderPlugin>();
+	private boolean requireConsent;
 
 	public List<String> getAvailableAttributeProviderPlugins() {
 		return AttributeProviderFactory.getAvailablePlugins();
@@ -170,4 +172,12 @@ public class OASTORKConfig {
 	public void setVidpEnabled(boolean update) {
 		vidpEnabled = update;
 	}
+	
+	public boolean isRequireConsent() {
+		return requireConsent;
+	}
+	
+	public void setRequireConsent(boolean update) {
+		requireConsent = update;
+	}
 }
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
index 370923ca1..f8a12e58b 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
@@ -1036,6 +1036,7 @@ public class EditOAAction extends ActionSupport implements ServletRequestAware,
         stork.setQaa(storkOA.getQaa());
         stork.setOAAttributes(storkOA.getAttributes());
         stork.setVidpEnabled(storkOA.isVidpEnabled());
+        stork.setRequireConsent(storkOA.isRequireConsent());
         stork.setAttributeProviders(storkOA.getAttributeProviderPlugins());
 
         try {
diff --git a/id/ConfigWebTool/src/main/resources/applicationResources.properties b/id/ConfigWebTool/src/main/resources/applicationResources.properties
index ef52892b3..18d19c06b 100644
--- a/id/ConfigWebTool/src/main/resources/applicationResources.properties
+++ b/id/ConfigWebTool/src/main/resources/applicationResources.properties
@@ -278,6 +278,7 @@ webpages.oaconfig.oauth20.clientSecret=Client Passwort
 webpages.oaconfig.oauth20.redirectUri=Redirect Uri 
 
 webpages.oaconfig.vidp.enabled=VIDP interface aktiv
+webpages.oaconfig.vidp.requireconsent=Zustimmung f\u00FCr das Ausliefern der Attribute vom Benutzer einholen?
 webpages.oaconfig.vidp.ap.new=Neuen Attribut Provider erstellen
 webpages.oaconfig.vidp.ap.remove=Entfernen
 webpages.oaconfig.vidp.ap.list=Liste der konfigurierten Attribut Provider
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
index 78ad500ef..6749b5131 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -537,6 +537,12 @@
 								key="webpages.oaconfig.vidp.enabled"
 								cssClass="checkbox"
 								id="OAuseVidp" /></p>
+							<p><s:checkbox name="storkOA.requireConsent" 
+								value="%{storkOA.requireConsent}"
+								labelposition="left"
+								key="webpages.oaconfig.vidp.requireconsent"
+								cssClass="checkbox"
+								id="OArequireConsent" /></p>
 							<h5><%=LanguageHelper.getGUIString("webpages.oaconfig.vidp.ap.list", request) %></h5>
 							<table id="stork_aplist">
 								<tr><th>AP Plugin</th><th>URL</th><th>Attribute (CSV)</th></tr>
-- 
cgit v1.2.3