aboutsummaryrefslogtreecommitdiffstats
path: root/epsdk-app-onap/src/main/webapp/WEB-INF
diff options
context:
space:
mode:
authorIttay Stern <ittay.stern@att.com>2019-07-29 10:23:11 +0000
committerGerrit Code Review <gerrit@onap.org>2019-07-29 10:23:11 +0000
commit216e4b4bff2815a7fbab8dbb572c7995812a193f (patch)
treea4a18bd5c400141f143e9ab7777c16870882658f /epsdk-app-onap/src/main/webapp/WEB-INF
parentb8590f71db22873e23342f92b97d77a9833bcf6e (diff)
parentbfd2c1c8e5ceac2da1755d6dd232d10ebe659e63 (diff)
Merge "Add app version to welcome page"
Diffstat (limited to 'epsdk-app-onap/src/main/webapp/WEB-INF')
-rw-r--r--epsdk-app-onap/src/main/webapp/WEB-INF/fusion/jsp/ebz/ebz_header.jsp20
1 files changed, 19 insertions, 1 deletions
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 44fe53a88..8fece9d16 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
@@ -246,6 +246,7 @@
<a ng-click="toggleDrawer();isOpen = !isOpen" href="javascript:void(0);" class="arrow-icon-left" >
<span class="icon-hamburger"></span></a>
<span ng-init="isOpen = true" ng-show="isOpen" style="font-size:16px; position:relative; top:-8px; left:-15px;">&nbsp&nbsp&nbsp {{app_name}}</span>
+ <span data-tests-id='app-version' ng-show="isOpen" style="font-size:13px; position:relative; top:15px; left:-45px; color:#666666;">{{app_version}}</span>
</span>
<div att-drawer drawer-slide="left" drawer-custom-top="{{drawer_custom_top}}px" drawer-size="200px" drawer-open="drawerOpen" drawer-custom-height="100%" >
<div ng-style="adjustHLeftMenu('leftMenu')">
@@ -313,6 +314,7 @@
fullName:'',
email:''
}
+ $scope.app_version="";
/*Put user info into fields*/
$scope.inputUserInfo = function(userInfo){
if (typeof(userInfo) != "undefined" && userInfo!=null && userInfo!=''){
@@ -425,7 +427,23 @@
console.log('getAppName failed', error);
});
-
+ LeftMenuService.getAppVersion().then(function(response){
+ var j = response;
+ try{
+ if(j){
+ $scope.app_version = j.displayVersion;
+
+ }else{
+ throw "Version response is not in expected format.";
+ }
+ }catch (e) {
+ console.log("Error happened while trying to get app version: "+e);
+ return;
+ }
+ },function(error){
+ console.log('getAppVersion failed', error);
+ });
+
$scope.getTopMenuStaticInfo();
$scope.getMenu=function() {