some bugfixes

1 files changed, 10 insertions, 1 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/IndexAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/IndexAction.java
index 545a84800..5a88b1324 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/IndexAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/IndexAction.java
@@ -128,6 +128,10 @@ public class IndexAction extends ActionSupport implements ServletRequestAware,
 			return Constants.STRUTS_ERROR;
 			
 		} else {
+			//TODO: maybe remove this default value in a later version
+			if (dbuser.isIsUsernamePasswordAllowed() == null)
+				dbuser.setIsUsernamePasswordAllowed(true);
+			
 			if (!dbuser.isIsActive() || !dbuser.isIsUsernamePasswordAllowed()) {
 				log.warn("Username " + dbuser.getUsername() + " is not active or Username/Password login is not allowed");
 				addActionError(LanguageHelper.getErrorString("webpages.index.login.notallowed"));
@@ -140,6 +144,11 @@ public class IndexAction extends ActionSupport implements ServletRequestAware,
 				return Constants.STRUTS_ERROR;
 			}
 			
+			//TODO: maybe remove this default value in a later version 
+			boolean ismandateuser = false;
+			if (dbuser.isIsMandateUser() != null)
+				ismandateuser = dbuser.isIsMandateUser();
+			
 			AuthenticatedUser authuser = new AuthenticatedUser(
 					dbuser.getHjid(), 
 					dbuser.getGivenname(), 
@@ -148,7 +157,7 @@ public class IndexAction extends ActionSupport implements ServletRequestAware,
 					dbuser.getUsername(), 
 					true, 
 					dbuser.isIsAdmin(),
-					dbuser.isIsMandateUser(),
+					ismandateuser,
 					false);
 			
 			Date date = DateTimeHelper.parseDateTime(dbuser.getLastLogin());