summaryrefslogtreecommitdiffstats
path: root/auth/auth-gui/src/main
diff options
context:
space:
mode:
authorInstrumental <jonathan.gathman@att.com>2018-10-19 11:13:05 -0500
committerInstrumental <jonathan.gathman@att.com>2018-10-19 11:13:16 -0500
commit575c9820dffbfee3311e19a5f64e64b98c2ed5f8 (patch)
tree654d24b98fd1b22194365aae58387eb1e66e9d37 /auth/auth-gui/src/main
parentc3726105c664d089158f095d3a353815d1c3de00 (diff)
Fix GUI Buttons
Issue-ID: AAF-435 Change-Id: I8b5e83609176a22b5aa54cac6fd0911488bd707b Signed-off-by: Instrumental <jonathan.gathman@att.com>
Diffstat (limited to 'auth/auth-gui/src/main')
-rw-r--r--auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/AAF_GUI.java19
1 files changed, 8 insertions, 11 deletions
diff --git a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/AAF_GUI.java b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/AAF_GUI.java
index 48164227..2e7e5e59 100644
--- a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/AAF_GUI.java
+++ b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/AAF_GUI.java
@@ -86,7 +86,6 @@ import org.onap.aaf.misc.env.APIException;
import org.onap.aaf.misc.env.Env;
import org.onap.aaf.misc.env.Slot;
import org.onap.aaf.misc.env.StaticSlot;
-import org.onap.aaf.misc.env.util.Split;
import org.onap.aaf.misc.rosetta.env.RosettaDF;
import org.onap.aaf.misc.xgen.html.HTMLGen;
import org.onap.aaf.misc.xgen.html.State;
@@ -113,22 +112,20 @@ public class AAF_GUI extends AbsService<AuthzEnv, AuthzTrans> implements State<E
public final Slot slot_httpServletRequest;
protected final String deployedVersion;
- private StaticSlot sTheme;
+ private StaticSlot sThemeWebPath;
public final String theme;
public AAF_GUI(final AuthzEnv env) throws Exception {
super(env.access(), env);
- sTheme = env.staticSlot(CachingFileAccess.CFA_WEB_PATH,access.getProperty(CachingFileAccess.CFA_WEB_PATH,null)==null?AAF_GUI_THEME:CachingFileAccess.CFA_WEB_PATH);
- theme = env.getProperty(AAF_GUI_THEME);
+ theme = env.getProperty(AAF_GUI_THEME,"theme/onap");
+ sThemeWebPath = env.staticSlot(CachingFileAccess.CFA_WEB_PATH);
+ if(env.get(sThemeWebPath)==null) {
+ env.put(sThemeWebPath,theme);
+ }
slot_httpServletRequest = env.slot(HTTP_SERVLET_REQUEST);
- String[] component = Split.split(':', access.getProperty(Config.AAF_COMPONENT, "N/A:2.x"));
- if (component.length>1) {
- deployedVersion =component[1];
- } else {
- deployedVersion = "2.x";
- }
+ deployedVersion = access.getProperty(Config.AAF_RELEASE, "N/A:2.x");
// Certificate Manager
cmCon = new AAFConHttp(env.access(),Config.CM_URL);
@@ -206,7 +203,7 @@ public class AAF_GUI extends AbsService<AuthzEnv, AuthzTrans> implements State<E
///////////////////////
// WebContent Handler
///////////////////////
- route(env,GET,"/"+env.get(sTheme)+"/:key", new CachingFileAccess<AuthzTrans>(env));
+ route(env,GET,"/"+env.get(sThemeWebPath)+"/:key", new CachingFileAccess<AuthzTrans>(env));
///////////////////////
aafCon = aafCon();
lur = aafCon.newLur();