summaryrefslogtreecommitdiffstats
path: root/epsdk-app-onap
diff options
context:
space:
mode:
authorIttay Stern <ittay.stern@att.com>2020-01-20 21:46:47 +0200
committerIttay Stern <ittay.stern@att.com>2020-01-23 16:25:10 +0200
commit68803a2495d66262d7e49f4c77957decbeda5ff0 (patch)
treef66238c428327083412fec0437d98d46f53986a8 /epsdk-app-onap
parent29a97a7fe7fa9c3c50fba299a7b1cf121be05b07 (diff)
Upgrade epsdk version to 2.6.0 (but keep overlay 2.5.0) (fix)
Issue-ID: VID-471 Issue-ID: VID-718 Complements commit 9c131c1f Change-Id: I26a87acf828b9f557724de26e00ef1bb6739a67b Signed-off-by: Ittay Stern <ittay.stern@att.com>
Diffstat (limited to 'epsdk-app-onap')
-rwxr-xr-xepsdk-app-onap/pom.xml5
-rw-r--r--epsdk-app-onap/src/main/webapp/WEB-INF/fusion/jsp/ebz/ebz_header.jsp78
2 files changed, 25 insertions, 58 deletions
diff --git a/epsdk-app-onap/pom.xml b/epsdk-app-onap/pom.xml
index be810e5ba..ff8ac2f13 100755
--- a/epsdk-app-onap/pom.xml
+++ b/epsdk-app-onap/pom.xml
@@ -24,7 +24,8 @@
<encoding>UTF-8</encoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <epsdk.version>2.5.0</epsdk.version>
+ <epsdk.version>2.6.0</epsdk.version>
+ <epsdk.overlay.version>2.5.0</epsdk.overlay.version>
<jackson.version>2.10.1</jackson.version>
<jackson.databind.version>2.10.1</jackson.databind.version>
<springframework.version>5.2.0.RELEASE</springframework.version>
@@ -269,7 +270,7 @@
<dependency>
<groupId>org.onap.portal.sdk</groupId>
<artifactId>epsdk-app-overlay</artifactId>
- <version>${epsdk.version}</version>
+ <version>${epsdk.overlay.version}</version>
<type>war</type>
</dependency>
<dependency>
diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/jsp/ebz/ebz_header.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/jsp/ebz/ebz_header.jsp
index 50a10d607..4571f34d8 100644
--- a/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/jsp/ebz/ebz_header.jsp
+++ b/epsdk-app-onap/src/main/webapp/WEB-INF/fusion/jsp/ebz/ebz_header.jsp
@@ -20,13 +20,12 @@
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
<%@ page isELIgnored="false"%>
-<%@ page import="org.onap.portalsdk.core.util.SystemProperties"%>
-<%@ page import="org.onap.portalsdk.core.onboarding.util.PortalApiProperties"%>
<%@ page import="org.onap.portalsdk.core.onboarding.util.PortalApiConstants"%>
-<%@ page import="org.onap.portalsdk.core.domain.MenuData"%>
+<%@ page import="org.onap.portalsdk.core.onboarding.util.PortalApiProperties"%>
+<%@ page import="org.onap.portalsdk.core.util.SystemProperties"%>
<link rel="stylesheet" type="text/css" href="app/fusion/external/ebz/ebz_header/header.css">
<link rel="stylesheet" type="text/css" href="app/fusion/external/ebz/ebz_header/portal_ebz_header.css">
-<link rel="stylesheet" type="text/css" href="app/fusion/external/ebz/sandbox/styles/style.css" >
+<link rel="stylesheet" type="text/css" href="app/fusion/external/ebz/sandbox/styles/style.css">
<%--<script src= "app/fusion/external/ebz/angular_js/angular.js"></script> --%>
@@ -688,55 +687,6 @@
"url": ""
},
{
- "menuId": 90,
- "column": 1,
- "text": "Google",
- "parentMenuId": 1,
- "url": "http://google.com"
- },
- {
- "menuId": 91,
- "column": 1,
- "text": "Mike Little's Coffee Cup",
- "parentMenuId": 2,
- "url": "http://coffee.com"
- },
- {
- "menuId": 92,
- "column": 2,
- "text": "Andy and his Astrophotgraphy",
- "parentMenuId": 3,
- "url": "http://nightskypix.com"
- },
- {
- "menuId": 93,
- "column": 1,
- "text": "JSONLint",
- "parentMenuId": 4,
- "url": "http://http://jsonlint.com"
- },
- {
- "menuId": 96,
- "column": 3,
- "text": "3rd Level App1c R200",
- "parentMenuId": 4,
- "url": "http://app1c.com"
- },
- {
- "menuId": 97,
- "column": 1,
- "text": "3rd Level App4b R16",
- "parentMenuId": 5,
- "url": "http://app4b.com"
- },
- {
- "menuId": 98,
- "column": 2,
- "text": "3rd Level App2b R16",
- "parentMenuId": 5,
- "url": "http://app2b.com"
- },
- {
"menuId": 99,
"column": 1,
"text": "Favorites",
@@ -748,11 +698,20 @@
$scope.megaMenuDataObject = menuStructureConvert($scope.jsonMenuData);
// $log.debug(JSON.stringify($scope.jsonMenuData));
}
+
+ LeftMenuService.getLeftMenu().then(function (response) {
+ var menu = {
+ parentList: JSON.parse(response.data),
+ childItemList: JSON.parse(response.data2)
+ };
+
+ try {
+
var childItemList="";
var parentList = "";
try{
- childItemList = ${menu.childItemList};
- parentList = ${menu.parentList};
+ childItemList = menu.childItemList;
+ parentList = menu.parentList;
}catch(err){
console.log("ebz_header: failed to get child/parent lists", err);
}
@@ -819,7 +778,14 @@
$timeout(function() {
detectScrollEvent();
}, 800);
-
+
+ } catch (e) {
+ console.log("error happened while trying to get app menu " + e);
+ }
+ }, function (error) {
+ console.log('getLeftMenu failed', error);
+ });
+
});
app.filter("ellipsis", function(){