Skip to content

Commit 36e9bb3

Browse files
committed
CLOUDSTACK-9805: Display VR list in network details
Displays a VR tab that lists VRs for the network in the detail views for isolated networks, shared networks and for VPCs. Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
1 parent 9bf4281 commit 36e9bb3

File tree

3 files changed

+24
-1
lines changed

3 files changed

+24
-1
lines changed

ui/index.jsp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1818,7 +1818,6 @@
18181818
<script type="text/javascript" src="scripts/ui-custom/securityRules.js"></script>
18191819
<script type="text/javascript" src="scripts/ui-custom/vpc.js"></script>
18201820
<script type="text/javascript" src="scripts/vpc.js"></script>
1821-
<script type="text/javascript" src="scripts/network.js"></script>
18221821
<script type="text/javascript" src="scripts/ui-custom/recurringSnapshots.js"></script>
18231822
<script type="text/javascript" src="scripts/ui-custom/uploadVolume.js"></script>
18241823
<script type="text/javascript" src="scripts/storage.js"></script>
@@ -1833,6 +1832,7 @@
18331832
<script type="text/javascript" src="scripts/ui-custom/physicalResources.js"></script>
18341833
<script type="text/javascript" src="scripts/ui-custom/zoneWizard.js"></script>
18351834
<script type="text/javascript" src="scripts/system.js"></script>
1835+
<script type="text/javascript" src="scripts/network.js"></script>
18361836
<script type="text/javascript" src="scripts/domains.js"></script>
18371837
<script type="text/javascript" src="scripts/docs.js"></script>
18381838
<script type="text/javascript" src="scripts/vm_snapshots.js"></script>

ui/scripts/network.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1194,6 +1194,10 @@
11941194
hiddenTabs.push('egressRules');
11951195
}
11961196

1197+
if (!isAdmin()) {
1198+
hiddenTabs.push("virtualRouters");
1199+
}
1200+
11971201
return hiddenTabs;
11981202
},
11991203

@@ -1892,6 +1896,11 @@
18921896
}
18931897
});
18941898
}
1899+
},
1900+
1901+
virtualRouters: {
1902+
title: "label.virtual.appliances",
1903+
listView: cloudStack.sections.system.subsections.virtualRouters.sections.routerNoGroup.listView
18951904
}
18961905
}
18971906
}
@@ -5905,6 +5914,10 @@
59055914
}
59065915
});
59075916
}
5917+
},
5918+
virtualRouters: {
5919+
title: "label.virtual.routers",
5920+
listView: cloudStack.sections.system.subsections.virtualRouters.sections.routerNoGroup.listView
59085921
}
59095922
}
59105923
}

ui/scripts/system.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9769,6 +9769,16 @@
97699769
domainid: args.context.routerGroupByAccount[0].domainid
97709770
})
97719771
}
9772+
if ("networks" in args.context) {
9773+
$.extend(data2, {
9774+
networkid: args.context.networks[0].id
9775+
})
9776+
}
9777+
if ("vpc" in args.context) {
9778+
$.extend(data2, {
9779+
vpcid: args.context.vpc[0].id
9780+
})
9781+
}
97729782
}
97739783

97749784
var routers =[];

0 commit comments

Comments
 (0)