etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1980 from shapeblue/vr-ui-tab 

CLOUDSTACK-9805: Display VR list in network details
This commit is contained in:
Rajani Karuturi 2017-04-20 15:29:59 +05:30 committed by GitHub
parent 41b7eee2cb 0ddcf0b175
commit 5dd814ae70
3 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/index.jsp
View File

@ -1818,7 +1818,6 @@
<script type="text/javascript" src="scripts/ui-custom/securityRules.js"></script>
<script type="text/javascript" src="scripts/ui-custom/vpc.js"></script>
<script type="text/javascript" src="scripts/vpc.js"></script>
<script type="text/javascript" src="scripts/network.js"></script>
<script type="text/javascript" src="scripts/ui-custom/recurringSnapshots.js"></script>
<script type="text/javascript" src="scripts/ui-custom/uploadVolume.js"></script>
<script type="text/javascript" src="scripts/storage.js"></script>
@ -1833,6 +1832,7 @@
<script type="text/javascript" src="scripts/ui-custom/physicalResources.js"></script>
<script type="text/javascript" src="scripts/ui-custom/zoneWizard.js"></script>
<script type="text/javascript" src="scripts/system.js"></script>
<script type="text/javascript" src="scripts/network.js"></script>
<script type="text/javascript" src="scripts/domains.js"></script>
<script type="text/javascript" src="scripts/docs.js"></script>
<script type="text/javascript" src="scripts/vm_snapshots.js"></script>

17
ui/scripts/network.js
View File

@ -1194,6 +1194,10 @@
hiddenTabs.push('egressRules');
}
if (!isAdmin()) {
hiddenTabs.push("virtualRouters");
}
return hiddenTabs;
},
@ -1892,6 +1896,11 @@
}
});
}
},
virtualRouters: {
title: "label.virtual.appliances",
listView: cloudStack.sections.system.subsections.virtualRouters.sections.routerNoGroup.listView
}
}
}
@ -5738,8 +5747,10 @@
tabFilter: function(args) {
var hiddenTabs = [];
var isRouterOwner = isAdmin();
if (!isRouterOwner)
if (!isRouterOwner) {
hiddenTabs.push("router");
hiddenTabs.push("virtualRouters");
}
return hiddenTabs;
},
@ -5905,6 +5916,10 @@
}
});
}
},
virtualRouters: {
title: "label.virtual.routers",
listView: cloudStack.sections.system.subsections.virtualRouters.sections.routerNoGroup.listView
}
}
}

10
ui/scripts/system.js
View File

@ -9472,6 +9472,16 @@
domainid: args.context.routerGroupByAccount[0].domainid
})
}
if ("networks" in args.context) {
$.extend(data2, {
networkid: args.context.networks[0].id
})
}
if ("vpc" in args.context) {
$.extend(data2, {
vpcid: args.context.vpc[0].id
})
}
}
var routers =[];