1 files changed, 7 insertions, 30 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/OpenAdminRequestsAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/OpenAdminRequestsAction.java
index f064795ec..a4c768eda 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/OpenAdminRequestsAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/OpenAdminRequestsAction.java
@@ -38,37 +38,31 @@ 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;
 import at.gv.egovernment.moa.id.configuration.data.OAListElement;
+import at.gv.egovernment.moa.id.configuration.exception.BasicActionException;
 import at.gv.egovernment.moa.id.configuration.helper.FormDataHelper;
 
 import com.opensymphony.xwork2.ActionSupport;
 
-public class OpenAdminRequestsAction extends ActionSupport 
-		implements ServletRequestAware, ServletResponseAware {
+public class OpenAdminRequestsAction extends BasicAction {
 	
 	private static final Logger log = Logger.getLogger(OpenAdminRequestsAction.class);
 	
 	private static final long serialVersionUID = 1L;
 
-	private HttpServletRequest request;
-//	private HttpServletResponse response;
-	
-	private AuthenticatedUser authUser = null; 
 	private List<OAListElement> formOAs = null;
 	private List<AuthenticatedUser> userlist = null;
 	
 
 	public String init() {
 		
-		HttpSession session = request.getSession();
-		if (session == null) {
-			log.info("No http Session found.");
+		try {
+			populateBasicInformations();
+			
+		} catch (BasicActionException e) {
 			return Constants.STRUTS_ERROR;
+			
 		}
 		
-		Object authUserObj = session.getAttribute(Constants.SESSION_AUTH);
-		
-		authUser = (AuthenticatedUser) authUserObj;
-		
 		if (authUser.isAdmin()) {
 			
 			List<OnlineApplication> dbOAs = ConfigurationDBRead.getAllNewOnlineApplications();
@@ -92,23 +86,6 @@ public class OpenAdminRequestsAction extends ActionSupport
 		
 	}
 	
-	
-	public void setServletResponse(HttpServletResponse response) {
-//		this.response = response;
-	}
-
-	public void setServletRequest(HttpServletRequest request) {
-		this.request = request;
-	}
-
-
-	/**
-	 * @return the authUser
-	 */
-	public AuthenticatedUser getAuthUser() {
-		return authUser;
-	}
-
 
 	/**
 	 * @return the formOAs