From 6e409edd540fb7e2bb6a66f14adeb72e550669c1 Mon Sep 17 00:00:00 2001
From: Alexander Marsalek <amarsalek@iaik.tugraz.at>
Date: Wed, 2 Jul 2014 16:02:45 +0200
Subject: added support for splitting authnrequest &signrequest

---
 id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp')

diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
index 6f266f865..4589a3381 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
@@ -249,10 +249,11 @@
 								labelposition="left" />
 							<h4><%=LanguageHelper.getGUIString("webpages.moaconfig.stork.pepslist", request) %></h4>
                             <table id="stork_pepslist">
-								<tr><th>Country Shortcode</th><th>PEPS URL</th>
+								<tr><th>Country Shortcode</th><th>PEPS URL</th><th>Supports XMLSignatures</th>
 								<s:iterator value="storkconfig.cpepslist" status="stat">
 								  <tr><td><s:textfield name="storkconfig.cpepslist[%{#stat.index}].countryCode" value="%{countryCode}" cssClass="textfield_short"/></td>
 								      <td><s:textfield name="storkconfig.cpepslist[%{#stat.index}].URL" value="%{URL}" cssClass="textfield_long"/></td>
+								      <td><s:checkbox name="storkconfig.cpepslist[%{#stat.index}].supportsXMLSignature" value="%{supportsXMLSignature}" /></td>
 								      <td><input type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.removepeps", request) %>" onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/></td></tr>
 								</s:iterator>
                                 <s:if test="%{storkconfig.cpepslist == null}">
-- 
cgit v1.2.3


From 27c5460e2138fbb7de64214a7538b98effb5a7a6 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Fri, 4 Jul 2014 14:44:26 +0200
Subject: fix: CPEPS list is now edited in place instead of clean and refill

---
 id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp')

diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
index 6f266f865..9b94bcef5 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
@@ -251,7 +251,8 @@
                             <table id="stork_pepslist">
 								<tr><th>Country Shortcode</th><th>PEPS URL</th>
 								<s:iterator value="storkconfig.cpepslist" status="stat">
-								  <tr><td><s:textfield name="storkconfig.cpepslist[%{#stat.index}].countryCode" value="%{countryCode}" cssClass="textfield_short"/></td>
+								  <tr><td><s:hidden name="storkconfig.cpepslist[%{#stat.index}].hjid" property="%{hjid}"/>
+								  	      <s:textfield name="storkconfig.cpepslist[%{#stat.index}].countryCode" value="%{countryCode}" cssClass="textfield_short"/></td>
 								      <td><s:textfield name="storkconfig.cpepslist[%{#stat.index}].URL" value="%{URL}" cssClass="textfield_long"/></td>
 								      <td><input type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.removepeps", request) %>" onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/></td></tr>
 								</s:iterator>
-- 
cgit v1.2.3


From b2c1ca665aaaa3246671ef2ec933e29b8ff87b25 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Fri, 4 Jul 2014 16:09:36 +0200
Subject: made country code readonly

---
 id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp')

diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
index 9b94bcef5..21ba246c1 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
@@ -252,7 +252,7 @@
 								<tr><th>Country Shortcode</th><th>PEPS URL</th>
 								<s:iterator value="storkconfig.cpepslist" status="stat">
 								  <tr><td><s:hidden name="storkconfig.cpepslist[%{#stat.index}].hjid" property="%{hjid}"/>
-								  	      <s:textfield name="storkconfig.cpepslist[%{#stat.index}].countryCode" value="%{countryCode}" cssClass="textfield_short"/></td>
+								  	      <s:property value="%{countryCode}" /></td>
 								      <td><s:textfield name="storkconfig.cpepslist[%{#stat.index}].URL" value="%{URL}" cssClass="textfield_long"/></td>
 								      <td><input type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.removepeps", request) %>" onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/></td></tr>
 								</s:iterator>
-- 
cgit v1.2.3


From 34ac95193f76a30f3bc96761c5bb02c5048f5a69 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 10 Jul 2014 12:26:43 +0200
Subject: solve problem with empty configuration

---
 id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp')

diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
index 1e8e36d4e..bf5625419 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
@@ -257,7 +257,7 @@
 								      <td><s:checkbox name="storkconfig.cpepslist[%{#stat.index}].supportsXMLSignature" value="%{supportsXMLSignature}" /></td>
 								      <td><input type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.removepeps", request) %>" onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/></td></tr>
 								</s:iterator>
-                                <s:if test="%{storkconfig.cpepslist == null}">
+                     						<s:if test="%{storkconfig.cpepslist == null || storkconfig.cpepslist.isEmpty}">
                                     <tr><td><s:textfield name="storkconfig.cpepslist[0].countryCode" value="CC" cssClass="textfield_short"/></td>
                                         <td><s:textfield name="storkconfig.cpepslist[0].URL" value="http://" cssClass="textfield_long"/></td>
                                         <td><input type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.removepeps", request) %>" onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/></td></tr>
-- 
cgit v1.2.3