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

bug 13386: System page - Virtual Router page - hide Public IP field when its zone's network type is Basic. [reviewed-by: Brian]

This commit is contained in:
Jessica Wang 2012-03-05 16:11:48 -08:00
parent ec3878955e
commit 8a0e5d28f2
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ui/scripts/system.js
View File

@ -2185,10 +2185,15 @@
details: {
title: 'label.details',
preFilter: function(args) {
if (!args.context.routers[0].project)
return ['project', 'projectid'];
return [];
var hiddenFields = [];
if (!args.context.routers[0].project) {
hiddenFields.push('project');
hiddenFields.push('projectid');
}
if(selectedZoneObj.networktype == 'Basic') {
hiddenFields.push('publicip'); //In Basic zone, guest IP is public IP. So, publicip is not returned by listRouters API. Only guestipaddress is returned by listRouters API.
}
return hiddenFields;
},
fields: [
{