- Change UserBase implementation

 - starts with general MOAID Config

1 files changed, 23 insertions, 6 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ListOAsAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ListOAsAction.java
index 9e6e04644..deb48111d 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ListOAsAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ListOAsAction.java
@@ -15,6 +15,7 @@ import com.opensymphony.xwork2.ActionSupport;
 import at.gv.egovernment.moa.id.commons.db.ConfigurationDBRead;
 import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils;
 import at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication;
+import at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplicationType;
 import at.gv.egovernment.moa.id.commons.db.dao.config.UserDatabase;
 import at.gv.egovernment.moa.id.configuration.Constants;
 import at.gv.egovernment.moa.id.configuration.auth.AuthenticatedUser;
@@ -57,14 +58,18 @@ public class ListOAsAction extends ActionSupport implements ServletRequestAware,
 			
 			if (authUser.isAdmin()) {
 				dbOAs = ConfigurationDBRead.getAllOnlineApplications();
-	
+				
 			} else {
 				UserDatabase authUserDB = ConfigurationDBRead.getUserWithID(authUser.getUserID());
-				dbOAs = authUserDB.getRegistratedOAs();
+				
+				if (authUserDB != null)
+					dbOAs = authUserDB.getOnlineApplication();
 			}
 						
-			addFormOAs(dbOAs);
+			addFormOAs(dbOAs);			
 
+			ConfigurationDBUtils.closeSession();
+			
 			return Constants.STRUTS_SUCCESS;
 			
 		}
@@ -116,12 +121,24 @@ public class ListOAsAction extends ActionSupport implements ServletRequestAware,
 				dbOAs = ConfigurationDBRead.searchOnlineApplications(friendlyname);
 				
 			} else {
-				dbOAs = ConfigurationDBRead.searchOnlineApplicationsFromUser(authUser.getUserID(), friendlyname);
-				
+				UserDatabase authUserDB = ConfigurationDBRead.getUserWithID(authUser.getUserID());
+				if (authUserDB != null) {
+					List<OnlineApplication> alldbOAs = authUserDB.getOnlineApplication();
+					
+					dbOAs = new ArrayList<OnlineApplication>();
+					
+					for (OnlineApplication el : alldbOAs) {
+						if (el.getPublicURLPrefix()
+								.toLowerCase().indexOf(friendlyname.toLowerCase()) > -1)
+							dbOAs.add(el);
+					}
+				}
 			}
 			
 			addFormOAs(dbOAs);
 			
+			ConfigurationDBUtils.closeSession();
+			
 			return Constants.STRUTS_SUCCESS;	
 		}
 		
@@ -131,7 +148,7 @@ public class ListOAsAction extends ActionSupport implements ServletRequestAware,
 	private void addFormOAs(List<OnlineApplication> dbOAs) {
 		
 		formOAs = new ArrayList<OAListElement>();
-		if (dbOAs == null) {
+		if (dbOAs == null || dbOAs.size() == 0) {
 			addActionError(LanguageHelper.getErrorString("errors.listOAs.noOA", request));
 			
 		} else {