Skip to content

Commit 6d51689

Browse files
committed
ui: fix for multiple network offering listing
Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
1 parent cb8f58b commit 6d51689

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

ui/scripts/network.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,7 @@
557557
validation: {
558558
required: true
559559
},
560-
dependsOn: ['zoneId', 'domain'],
560+
dependsOn: (isAdmin() || isDomainAdmin()) ? ['zoneId', 'domain'] : 'zoneId', // domain is visible only for admins
561561
docID: 'helpGuestNetworkNetworkOffering',
562562
select: function(args) {
563563
var data = {
@@ -567,7 +567,7 @@
567567
state: 'Enabled'
568568
};
569569

570-
if (args.domain != undefined && args.domain != null) {
570+
if ((isAdmin() || isDomainAdmin())) { // domain is visible only for admins
571571
$.extend(data, {
572572
domainid: args.domain
573573
});

ui/scripts/sharedFunctions.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -947,7 +947,7 @@ var addL2GuestNetwork = {
947947
validation: {
948948
required: true
949949
},
950-
dependsOn: ['zoneId', 'domain'],
950+
dependsOn: (isAdmin() || isDomainAdmin()) ? ['zoneId', 'domain'] : 'zoneId', // domain is visible only for admins
951951
docID: 'helpGuestNetworkNetworkOffering',
952952
select: function(args) {
953953
var data = {
@@ -956,7 +956,7 @@ var addL2GuestNetwork = {
956956
state: 'Enabled'
957957
};
958958

959-
if (args.domain != undefined && args.domain != null) {
959+
if ((isAdmin() || isDomainAdmin())) { // domain is visible only for admins
960960
$.extend(data, {
961961
domainid: args.domain
962962
});

0 commit comments

Comments
 (0)