diff options
| author |   Ittay Stern <ittay.stern@att.com> | 2019-07-30 12:27:40 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-07-30 12:27:40 +0000 |
| commit | 43e9904b232c1c957857da534cd5605aa9984db3 (patch) | |
| tree | 93d5ecbe339ba70e987337f8af5c4a1474936789 | |
| parent | d39964940a6fecbd86007327e6026dda73f7ac18 (diff) | |
| parent | 1a53b6bf5ab268e7a92d90ee9fe812d8835e7490 (diff) | |
Merge "Add app version to welcome page"
| -rw-r--r-- | epsdk-app-onap/src/main/webapp/WEB-INF/fusion/jsp/ebz/ebz_header.jsp | 36 |
1 files changed, 34 insertions, 2 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..4808ccd43 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;">    {{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!=''){ @@ -388,7 +390,21 @@ } ]; return megaMenuDataObjectTemp; - }; + }; + + var getAppVersion = function() { + return $http.get('version') + .then(function(response) { + if (typeof response.data === 'object') { + return response.data; + } else { + return $q.reject(response.data); + } + }, function(response) { + // something went wrong + return $q.reject(response.data); + }); + } /*Left Menu*/ @@ -425,7 +441,23 @@ console.log('getAppName failed', error); }); - + 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() { |