From def91ef4b2e19c18aa1f17de391fe08f165292a8 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 30 Oct 2014 14:40:28 +0100
Subject: fix problems with non-admin user

---
 .../moa/id/configuration/struts/action/BasicOAAction.java        | 9 ++++++---
 .../moa/id/configuration/struts/action/EditOAAction.java         | 5 ++++-
 id/ConfigWebTool/src/main/resources/struts.xml                   | 2 +-
 id/ConfigWebTool/src/main/webapp/jsp/openadminrequests.jsp       | 4 +++-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java
index 9c1cb90e0..415e1c957 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java
@@ -401,9 +401,7 @@ public class BasicOAAction extends BasicAction {
     		form.store(dboa, authUser, request);
     	
         try {
-            if (dboa.isIsNew()) {
-                ConfigurationDBUtils.save(dboa);
-
+            if (dboa.isIsNew()) {              
                 if (!authUser.isAdmin()) {
                     UserDatabase user = ConfigurationDBRead.getUserWithID(authUser.getUserID());
 
@@ -412,7 +410,12 @@ public class BasicOAAction extends BasicAction {
 
                     useroas.add(dboa);
                     ConfigurationDBUtils.saveOrUpdate(user);
+                    
+                } else {
+                	ConfigurationDBUtils.save(dboa);
+                	
                 }
+                
             } else
                 ConfigurationDBUtils.saveOrUpdate(dboa);
 
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
index 1893b0f60..4cd556b75 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
@@ -346,8 +346,11 @@ public class EditOAAction extends BasicOAAction {
 					ConfigurationDBUtils.saveOrUpdate(moaconfig);
 	
 				}
+			} catch (NullPointerException e) { 
+				log.debug("Found no MetadataURL in OA-Databaseconfig");
+				
 			} catch (Throwable e) {
-				log.info("Found no MetadataURL in OA-Databaseconfig!", e);
+				log.info("Set metadata refresh flag FAILED.", e);
 			}
 	
 			if (ConfigurationDBUtils.delete(onlineapplication)) {
diff --git a/id/ConfigWebTool/src/main/resources/struts.xml b/id/ConfigWebTool/src/main/resources/struts.xml
index 31f3889de..39c38ae43 100644
--- a/id/ConfigWebTool/src/main/resources/struts.xml
+++ b/id/ConfigWebTool/src/main/resources/struts.xml
@@ -155,7 +155,7 @@
  		  
  		<action name="newOA" method="newOA" class="at.gv.egovernment.moa.id.configuration.struts.action.EditOAAction">
 			<result name="editOA">/jsp/editOAGeneral.jsp</result>
-			<result name="success" type="chain">main</result>
+			<result name="success">/jsp/mainpage.jsp</result>
 			<result name="error">/error.jsp</result>
 			<result name="reauthentication" type="redirectAction">
 	          <param name="actionName">logout</param>
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/openadminrequests.jsp b/id/ConfigWebTool/src/main/webapp/jsp/openadminrequests.jsp
index 954bf9b8b..0cd861884 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/openadminrequests.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/openadminrequests.jsp
@@ -38,7 +38,9 @@
 
 				<div class="oa_config_block">
 					<h3><%=LanguageHelper.getGUIString("webpages.openadminrequests.oas.header", request) %></h3>
-					<jsp:include page="snippets/oas_list.jsp"></jsp:include>
+					<s:include value="snippets/oas_list.jsp">
+						<s:param name="editAction">loadOA</s:param>
+					</s:include>
 				</div>
 
 			</s:if>
-- 
cgit v1.2.3