aboutsummaryrefslogtreecommitdiff
path: root/id/server/moa-id-frontend-resources
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2020-07-07 15:25:58 +0200
committerThomas Lenz <tlenz@iaik.tugraz.at>2020-07-07 15:25:58 +0200
commit0e6a03ffbc11d07ee2d00abcd573239a971f89b5 (patch)
tree8bce1f4fb963185ba7e36e63bd282199cccba840 /id/server/moa-id-frontend-resources
parentaebaed0e889413491b5769babf39a200bd312992 (diff)
parentf8a4ef47e8a2a37402a400ea83650738c5d5cf2a (diff)
downloadmoa-id-spss-0e6a03ffbc11d07ee2d00abcd573239a971f89b5.tar.gz
moa-id-spss-0e6a03ffbc11d07ee2d00abcd573239a971f89b5.tar.bz2
moa-id-spss-0e6a03ffbc11d07ee2d00abcd573239a971f89b5.zip
Merge branch 'current_development' into development_preview
Diffstat (limited to 'id/server/moa-id-frontend-resources')
-rw-r--r--id/server/moa-id-frontend-resources/pom.xml2
-rw-r--r--id/server/moa-id-frontend-resources/src/main/java/at/gv/egovernment/moa/id/auth/frontend/builder/AbstractServiceProviderSpecificGUIFormBuilderConfiguration.java2
-rw-r--r--id/server/moa-id-frontend-resources/src/main/java/at/gv/egovernment/moa/id/auth/frontend/utils/FormBuildUtils.java9
3 files changed, 7 insertions, 6 deletions
diff --git a/id/server/moa-id-frontend-resources/pom.xml b/id/server/moa-id-frontend-resources/pom.xml
index 1efdd0195..87f9cbed7 100644
--- a/id/server/moa-id-frontend-resources/pom.xml
+++ b/id/server/moa-id-frontend-resources/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>MOA.id</groupId>
<artifactId>moa-id</artifactId>
- <version>4.1.2-SNAPSHOT</version>
+ <version>4.1.2</version>
</parent>
<groupId>MOA.id.server</groupId>
diff --git a/id/server/moa-id-frontend-resources/src/main/java/at/gv/egovernment/moa/id/auth/frontend/builder/AbstractServiceProviderSpecificGUIFormBuilderConfiguration.java b/id/server/moa-id-frontend-resources/src/main/java/at/gv/egovernment/moa/id/auth/frontend/builder/AbstractServiceProviderSpecificGUIFormBuilderConfiguration.java
index 23b8dcd84..b13e29137 100644
--- a/id/server/moa-id-frontend-resources/src/main/java/at/gv/egovernment/moa/id/auth/frontend/builder/AbstractServiceProviderSpecificGUIFormBuilderConfiguration.java
+++ b/id/server/moa-id-frontend-resources/src/main/java/at/gv/egovernment/moa/id/auth/frontend/builder/AbstractServiceProviderSpecificGUIFormBuilderConfiguration.java
@@ -162,7 +162,7 @@ public abstract class AbstractServiceProviderSpecificGUIFormBuilderConfiguration
} else {
setViewParameter(null, PARAM_COUNTRYLIST, "");
- setViewParameter(null, PARAM_EIDAS_VISIBLE, FormBuildUtils.TEMPLATEVISIBLE);
+ setViewParameter(null, PARAM_EIDAS_VISIBLE, FormBuildUtils.TEMPLATEUNVISIBLE);
}
diff --git a/id/server/moa-id-frontend-resources/src/main/java/at/gv/egovernment/moa/id/auth/frontend/utils/FormBuildUtils.java b/id/server/moa-id-frontend-resources/src/main/java/at/gv/egovernment/moa/id/auth/frontend/utils/FormBuildUtils.java
index 8e4e7e5b3..3bba17b30 100644
--- a/id/server/moa-id-frontend-resources/src/main/java/at/gv/egovernment/moa/id/auth/frontend/utils/FormBuildUtils.java
+++ b/id/server/moa-id-frontend-resources/src/main/java/at/gv/egovernment/moa/id/auth/frontend/utils/FormBuildUtils.java
@@ -50,7 +50,8 @@ public class FormBuildUtils {
private static String PARAM_MANDATEVISIBLE = "MANDATEVISIBLE";
private static String PARAM_MANDATECHECKED = "MANDATECHECKED";
- public static final String TEMPLATEVISIBLE = " unvisible";
+ public static final String TEMPLATEVISIBLE = " visible";
+ public static final String TEMPLATEUNVISIBLE = " unvisible";
public static final String TEMPLATEDISABLED = "disabled=\"true\"";
public static final String TEMPLATECHECKED = "checked=\"true\"";
public static final String TEMPLATE_ARIACHECKED = "aria-checked=";
@@ -79,9 +80,9 @@ public class FormBuildUtils {
public static void customiceLayoutBKUSelection(Map<String, Object> params, IOAAuthParameters oaParam) {
if (oaParam.isShowMandateCheckBox())
- params.put(PARAM_MANDATEVISIBLE, "");
- else
params.put(PARAM_MANDATEVISIBLE, TEMPLATEVISIBLE);
+ else
+ params.put(PARAM_MANDATEVISIBLE, TEMPLATEUNVISIBLE);
if (oaParam.isOnlyMandateAllowed()) {
params.put(PARAM_MANDATECHECKED, TEMPLATECHECKED + " " +
@@ -117,7 +118,7 @@ public class FormBuildUtils {
* @return
*/
public static void defaultLayoutBKUSelection(Map<String, Object> params) {
- params.put(PARAM_MANDATEVISIBLE, TEMPLATEVISIBLE);
+ params.put(PARAM_MANDATEVISIBLE, TEMPLATEUNVISIBLE);
params.put(PARAM_MANDATECHECKED, TEMPLATE_ARIACHECKED + "\"false\"");
params.putAll(getDefaultMap());