Merge branch 'moa-2.1-Snapshot' into authnrequest_signrequest_split

5 files changed, 34 insertions, 1 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASAML1Config.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASAML1Config.java
index 8d7d02048..7b5575a90 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASAML1Config.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASAML1Config.java
@@ -42,6 +42,7 @@ public class OASAML1Config implements IOnlineApplicationData{
 	private Boolean provideCertificate = false;
 	private Boolean provideFullMandateData = false;
 	private Boolean useCondition = false;
+	private Boolean provideAllErrors = true;
 	private int conditionLength = -1;
 	
 	
@@ -71,6 +72,9 @@ public class OASAML1Config implements IOnlineApplicationData{
 				provideIdentityLink = saml1.isProvideIdentityLink();
 				provideStammZahl = saml1.isProvideStammzahl();
 				
+				if (saml1.isProvideAllErrors() != null)
+					provideAllErrors = saml1.isProvideAllErrors();
+				
 				if (saml1.isUseCondition() != null)
 					useCondition = saml1.isUseCondition();
 				
@@ -122,6 +126,7 @@ public class OASAML1Config implements IOnlineApplicationData{
 	            saml1.setProvideIdentityLink(isProvideIdentityLink());
 	            saml1.setProvideStammzahl(isProvideStammZahl());
 	            saml1.setUseCondition(isUseCondition());
+	            saml1.setProvideAllErrors(provideAllErrors);
 	            saml1.setConditionLength(BigInteger.valueOf(getConditionLength()));
 	            // TODO: set sourceID
 	            // saml1.setSourceID("");
@@ -185,5 +190,21 @@ public class OASAML1Config implements IOnlineApplicationData{
 	 */
 	public void setActive(boolean isActive) {
 		this.isActive = isActive;
+	}
+
+	/**
+	 * @return the provideAllErrors
+	 */
+	public Boolean getProvideAllErrors() {
+		return provideAllErrors;
+	}
+
+	/**
+	 * @param provideAllErrors the provideAllErrors to set
+	 */
+	public void setProvideAllErrors(Boolean provideAllErrors) {
+		this.provideAllErrors = provideAllErrors;
 	}	
+	
+	
 }
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 4036bc25f..e988cc292 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
@@ -181,7 +181,9 @@ public class OATargetConfiguration implements IOnlineApplicationData {
 	                num = num.substring(Constants.IDENIFICATIONTYPE_ERSB.length());
 			}
 			
-            IdentificationNumber idnumber = new IdentificationNumber();
+			IdentificationNumber idnumber = authoa.getIdentificationNumber();
+			if (idnumber == null)
+				idnumber = new IdentificationNumber();
 
             if (getIdentificationType().equals(Constants.IDENIFICATIONTYPE_STORK)) {
                 idnumber.setValue(Constants.PREFIX_STORK + "AT" + "+" + num);
diff --git a/id/ConfigWebTool/src/main/resources/applicationResources_de.properties b/id/ConfigWebTool/src/main/resources/applicationResources_de.properties
index 5b7f2cc01..e4e7a0b63 100644
--- a/id/ConfigWebTool/src/main/resources/applicationResources_de.properties
+++ b/id/ConfigWebTool/src/main/resources/applicationResources_de.properties
@@ -295,6 +295,7 @@ webpages.oaconfig.saml1.provideCertificate=Zertifikat \u00FCbertragen
 webpages.oaconfig.saml1.provideFullMandateData=Vollst\u00E4ndige Vollmacht \u00FCbertragen
 webpages.oaconfig.saml1.useCondition=Usecondition
 webpages.oaconfig.saml1.conditionLength=ConditionLength
+webpages.oaconfig.saml1.provideAllErrors=Fehlermeldungen an OA \u00FCbertragen
 
 webpages.oaconfig.protocols.pvp2.header=PVP2.x Konfiguration
 webpages.oaconfig.pvp2.reload=PVP2.x konfiguration neu laden
diff --git a/id/ConfigWebTool/src/main/resources/applicationResources_en.properties b/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
index cc6e98964..dcf36103b 100644
--- a/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
+++ b/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
@@ -293,6 +293,7 @@ webpages.oaconfig.saml1.provideCertificate=Transfer certificate
 webpages.oaconfig.saml1.provideFullMandateData=Transfer complete mandate data
 webpages.oaconfig.saml1.useCondition=Use condition
 webpages.oaconfig.saml1.conditionLength=Condition length
+webpages.oaconfig.saml1.provideAllErrors=Transfer errors to application
 
 webpages.oaconfig.protocols.pvp2.header=PVP2.x configuration
 webpages.oaconfig.pvp2.reload=Load new PVP2.x configuration
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/saml1.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/saml1.jsp
index 4fd02aa61..a004a03a3 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/saml1.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/saml1.jsp
@@ -45,6 +45,14 @@
 								key="webpages.oaconfig.saml1.provideFullMandateData"
 								cssClass="checkbox">
 							</s:checkbox>
+							<br>
+							<s:checkbox name="saml1OA.provideAllErrors" 
+								value="%{saml1OA.provideAllErrors}"
+								labelposition="left"
+								key="webpages.oaconfig.saml1.provideAllErrors"
+								cssClass="checkbox">
+							</s:checkbox>	
+							
 <%-- 							<br>
 							<br>
 							<br>