aboutsummaryrefslogtreecommitdiff
path: root/id/ConfigWebTool/src/main
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2014-06-30 13:26:02 +0200
committerThomas Lenz <tlenz@iaik.tugraz.at>2014-06-30 13:26:02 +0200
commit32f084659d5f2d855c32fa55613e1bb4e431dadf (patch)
tree945d7837ff010103b1467cd34026cf821dcb2b53 /id/ConfigWebTool/src/main
parent7830437391cf5fe927605e82492d79fdb872059e (diff)
downloadmoa-id-spss-32f084659d5f2d855c32fa55613e1bb4e431dadf.tar.gz
moa-id-spss-32f084659d5f2d855c32fa55613e1bb4e431dadf.tar.bz2
moa-id-spss-32f084659d5f2d855c32fa55613e1bb4e431dadf.zip
add checkbox to choose if all errors should be send back to online application
Diffstat (limited to 'id/ConfigWebTool/src/main')
-rw-r--r--id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASAML1Config.java21
-rw-r--r--id/ConfigWebTool/src/main/resources/applicationResources_de.properties1
-rw-r--r--id/ConfigWebTool/src/main/resources/applicationResources_en.properties1
-rw-r--r--id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/saml1.jsp8
4 files changed, 31 insertions, 0 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/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>