From 6d516891ec5be81c57352f3a40a3ee4ff68df73a Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Fri, 12 Jul 2019 13:51:39 +0530 Subject: [PATCH] ui: fix for multiple network offering listing Signed-off-by: Abhishek Kumar --- ui/scripts/network.js | 4 ++-- ui/scripts/sharedFunctions.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 42ffd8cec88..7e5f554d08a 100644 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -557,7 +557,7 @@ validation: { required: true }, - dependsOn: ['zoneId', 'domain'], + dependsOn: (isAdmin() || isDomainAdmin()) ? ['zoneId', 'domain'] : 'zoneId', // domain is visible only for admins docID: 'helpGuestNetworkNetworkOffering', select: function(args) { var data = { @@ -567,7 +567,7 @@ state: 'Enabled' }; - if (args.domain != undefined && args.domain != null) { + if ((isAdmin() || isDomainAdmin())) { // domain is visible only for admins $.extend(data, { domainid: args.domain }); diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js index 9a29c981cfc..9fe51515338 100644 --- a/ui/scripts/sharedFunctions.js +++ b/ui/scripts/sharedFunctions.js @@ -947,7 +947,7 @@ var addL2GuestNetwork = { validation: { required: true }, - dependsOn: ['zoneId', 'domain'], + dependsOn: (isAdmin() || isDomainAdmin()) ? ['zoneId', 'domain'] : 'zoneId', // domain is visible only for admins docID: 'helpGuestNetworkNetworkOffering', select: function(args) { var data = { @@ -956,7 +956,7 @@ var addL2GuestNetwork = { state: 'Enabled' }; - if (args.domain != undefined && args.domain != null) { + if ((isAdmin() || isDomainAdmin())) { // domain is visible only for admins $.extend(data, { domainid: args.domain });