Merge branch 'development_preview'

1 files changed, 17 insertions, 0 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicAction.java
index 0d0cda246..9bbbe3df0 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicAction.java
@@ -56,6 +56,17 @@ public class BasicAction extends ActionSupport implements ServletRequestAware,
 	protected HttpSession session = null;
     protected String formID;
 		
+    protected static boolean isMoaidMode = false;
+    
+    public BasicAction() {
+		try {
+			isMoaidMode = ConfigurationProvider.getInstance().isMOAIDMode();
+		} catch (ConfigurationException e) {
+			log.warn("Can NOT load configuration. Set 'moaidmode' to 'false'", e);
+		}
+	}
+    
+    
 	protected void populateBasicInformations() throws BasicActionException {
 		try {
 			configuration = ConfigurationProvider.getInstance();
@@ -115,6 +126,12 @@ public class BasicAction extends ActionSupport implements ServletRequestAware,
     public void setFormID(String formID) {
         this.formID = formID;
     }
+
+
+	public static boolean isMoaidMode() {
+		return isMoaidMode;
+	}
 	
+    
 
 }