From 33448e8d05a087804489fb73b36a81dfc9b288d3 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 24 Mar 2014 10:27:53 +0100
Subject: solve VIDP problem if user is no admin

---
 id/ConfigWebTool/src/main/webapp/js/common.js          | 2 +-
 id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/id/ConfigWebTool/src/main/webapp/js/common.js b/id/ConfigWebTool/src/main/webapp/js/common.js
index 7b3974533..d31a65d87 100644
--- a/id/ConfigWebTool/src/main/webapp/js/common.js
+++ b/id/ConfigWebTool/src/main/webapp/js/common.js
@@ -214,8 +214,8 @@ function userOnLoad() {
 	return true;
 }
 function oaOnLoad() {
-	oaBusinessService();
     oaStorkService();
+	oaBusinessService();
 	oaSSOService();
 	oaLegacyService();
 	oaStork();
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
index 6749b5131..df946b3a7 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -70,7 +70,7 @@
                                     >
                         </s:checkbox>
 
-
+						<s:if test="authUser.isAdmin()">
                         <s:checkbox name="generalOA.storkService"
                                     value="%{generalOA.storkService}"
                                     labelposition="left"
@@ -80,6 +80,7 @@
                                     id="OAisstorkservice"
                                     disabled="%{isOnlyStorkService()}">
                         </s:checkbox>
+            </s:if>
 
 					</div>
 					
@@ -102,6 +103,7 @@
 						</s:textfield>		
 					</div>
 
+					<s:if test="authUser.isAdmin()">
                     <div id="oa_config_storkservice" class="oa_config_block">
                         <h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.stork.header", request) %></h3>
                         <s:textfield name="generalOA.storkSPTargetCountry"
@@ -112,6 +114,7 @@
                                      disabled="%{isDeactivatedStorkService()}">
                         </s:textfield>
                     </div>
+          </s:if>
 					
 					<s:if test="!isOnlyBusinessService()">
 						<div id="oa_config_publicservice" class="oa_config_block">
-- 
cgit v1.2.3