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

ui: fix for multiple network offering listing 

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
This commit is contained in:
Abhishek Kumar 2019-07-12 13:51:39 +05:30
parent cb8f58b706
commit 6d516891ec
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/scripts/network.js
View File

@ -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
});

4
ui/scripts/sharedFunctions.js
View File

@ -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
});