diff options
| -rw-r--r-- | lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js | 7 | ||||
| -rw-r--r-- | login/src/main/webapp/login/html/menu.html | 4 | ||||
| -rw-r--r-- | login/src/main/webapp/login/js/menuApp.js | 8 |
3 files changed, 10 insertions, 9 deletions
diff --git a/lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js b/lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js index 138c6edf..3913fa02 100644 --- a/lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js +++ b/lifecyclemgr/src/main/webapp/lifecyclemgr/js/app.js @@ -831,9 +831,12 @@ var app = angular.module("lcApp", ["ui.router", "ngTable"])/*, 'ui.bootstrap', ' }
function fetchDataForVl(jsonData) {
- var header = ["Network Resource Name","Link Port Resource Name"];
+ var header = ["Virtual Link Instance Name","Related CP List"];
var rowData = jsonData.vlInfo.map(function (vl) {
- return {"values": [vl.networkResource.resourceName, vl.linkPortResource.resourceName]}
+ return {"values": [vl.vlInstanceName, vl.relatedCpInstanceId.map(
+ function (cp) {
+ return cp.cpInstanceName;
+ }).join(', ')]}
});
return {"itemHeader": header,"rowitem": rowData,"striped": false,"border": true,"hover": true,"condensed": false,"filter": false,"action": "","searchField": ""}
}
diff --git a/login/src/main/webapp/login/html/menu.html b/login/src/main/webapp/login/html/menu.html index 713bedee..bd10fe16 100644 --- a/login/src/main/webapp/login/html/menu.html +++ b/login/src/main/webapp/login/html/menu.html @@ -279,9 +279,7 @@ </a> </div> </div> - <div id="mainFrame_div"> - <iframe id="mainFrame" name="mainFrame" frameBorder="0" scrolling="no" width="100%" height="100%" onload="iFrameHeight()"></iframe> - </div> + <iframe id="mainFrame" name="mainFrame" frameBorder="0" scrolling="no" width="100%" height="100%" onload="iFrameHeight()"></iframe> </div> </div> </div> diff --git a/login/src/main/webapp/login/js/menuApp.js b/login/src/main/webapp/login/js/menuApp.js index 3696eb15..8a82de1a 100644 --- a/login/src/main/webapp/login/js/menuApp.js +++ b/login/src/main/webapp/login/js/menuApp.js @@ -65,15 +65,15 @@ function iFrameHeight() { function displayIframe() { var dashboard_div = document.getElementById("dashboard_div"); - var mainFrame_div = document.getElementById("mainFrame_div"); + var mainFrame = document.getElementById("mainFrame"); dashboard_div.style.display = "none"; - mainFrame_div.style.display = ""; + mainFrame.style.display = ""; } function displayDashboard() { var dashboard_div = document.getElementById("dashboard_div"); - var mainFrame_div = document.getElementById("mainFrame_div"); - mainFrame_div.style.display = "none"; + var mainFrame = document.getElementById("mainFrame"); + mainFrame.style.display = "none"; dashboard_div.style.display = ""; } |