diff --git a/ui/scripts/events.js b/ui/scripts/events.js index a8e7085de31..820bb70eba0 100644 --- a/ui/scripts/events.js +++ b/ui/scripts/events.js @@ -56,28 +56,36 @@ }); } }, + domainid: { label: 'Domain', select: function(args) { - $.ajax({ - url: createURL('listDomains'), - data: { - listAll: true, - details: 'min' - }, - success: function(json) { - var array1 = [{id: '', description: ''}]; - var domains = json.listdomainsresponse.domain; - if(domains != null && domains.length > 0) { - for(var i = 0; i < domains.length; i++) { - array1.push({id: domains[i].id, description: domains[i].path}); + if(isAdmin() || isDomainAdmin()) { + $.ajax({ + url: createURL('listDomains'), + data: { + listAll: true, + details: 'min' + }, + success: function(json) { + var array1 = [{id: '', description: ''}]; + var domains = json.listdomainsresponse.domain; + if(domains != null && domains.length > 0) { + for(var i = 0; i < domains.length; i++) { + array1.push({id: domains[i].id, description: domains[i].path}); + } } + args.response.success({ + data: array1 + }); } - args.response.success({ - data: array1 - }); - } - }); + }); + } + else { + args.response.success({ + data: null + }); + } }, isHidden: function(args) { if(isAdmin() || isDomainAdmin()) @@ -86,6 +94,7 @@ return true; } }, + account: { label: 'Account', isHidden: function(args) { diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index baa4b72196a..22bbbfd4411 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -86,25 +86,32 @@ domainid: { label: 'Domain', select: function(args) { - $.ajax({ - url: createURL('listDomains'), - data: { - listAll: true, - details: 'min' - }, - success: function(json) { - var array1 = [{id: '', description: ''}]; - var domains = json.listdomainsresponse.domain; - if(domains != null && domains.length > 0) { - for(var i = 0; i < domains.length; i++) { - array1.push({id: domains[i].id, description: domains[i].path}); + if(isAdmin() || isDomainAdmin()) { + $.ajax({ + url: createURL('listDomains'), + data: { + listAll: true, + details: 'min' + }, + success: function(json) { + var array1 = [{id: '', description: ''}]; + var domains = json.listdomainsresponse.domain; + if(domains != null && domains.length > 0) { + for(var i = 0; i < domains.length; i++) { + array1.push({id: domains[i].id, description: domains[i].path}); + } } + args.response.success({ + data: array1 + }); } - args.response.success({ - data: array1 - }); - } - }); + }); + } + else { + args.response.success({ + data: null + }); + } }, isHidden: function(args) { if(isAdmin() || isDomainAdmin()) diff --git a/ui/scripts/network.js b/ui/scripts/network.js index a4f4a4d9013..49644c29f4b 100644 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -464,28 +464,36 @@ }); } }, - domainid: { + + domainid: { label: 'Domain', select: function(args) { - $.ajax({ - url: createURL('listDomains'), - data: { - listAll: true, - details: 'min' - }, - success: function(json) { - var array1 = [{id: '', description: ''}]; - var domains = json.listdomainsresponse.domain; - if(domains != null && domains.length > 0) { - for(var i = 0; i < domains.length; i++) { - array1.push({id: domains[i].id, description: domains[i].path}); + if(isAdmin() || isDomainAdmin()) { + $.ajax({ + url: createURL('listDomains'), + data: { + listAll: true, + details: 'min' + }, + success: function(json) { + var array1 = [{id: '', description: ''}]; + var domains = json.listdomainsresponse.domain; + if(domains != null && domains.length > 0) { + for(var i = 0; i < domains.length; i++) { + array1.push({id: domains[i].id, description: domains[i].path}); + } } + args.response.success({ + data: array1 + }); } - args.response.success({ - data: array1 - }); - } - }); + }); + } + else { + args.response.success({ + data: null + }); + } }, isHidden: function(args) { if(isAdmin() || isDomainAdmin()) @@ -494,6 +502,7 @@ return true; } }, + account: { label: 'Account', isHidden: function(args) { @@ -3681,28 +3690,36 @@ }); } }, - domainid: { + + domainid: { label: 'Domain', select: function(args) { - $.ajax({ - url: createURL('listDomains'), - data: { - listAll: true, - details: 'min' - }, - success: function(json) { - var array1 = [{id: '', description: ''}]; - var domains = json.listdomainsresponse.domain; - if(domains != null && domains.length > 0) { - for(var i = 0; i < domains.length; i++) { - array1.push({id: domains[i].id, description: domains[i].path}); + if(isAdmin() || isDomainAdmin()) { + $.ajax({ + url: createURL('listDomains'), + data: { + listAll: true, + details: 'min' + }, + success: function(json) { + var array1 = [{id: '', description: ''}]; + var domains = json.listdomainsresponse.domain; + if(domains != null && domains.length > 0) { + for(var i = 0; i < domains.length; i++) { + array1.push({id: domains[i].id, description: domains[i].path}); + } } + args.response.success({ + data: array1 + }); } - args.response.success({ - data: array1 - }); - } - }); + }); + } + else { + args.response.success({ + data: null + }); + } }, isHidden: function(args) { if(isAdmin() || isDomainAdmin()) @@ -3711,6 +3728,7 @@ return true; } }, + account: { label: 'Account', isHidden: function(args) { diff --git a/ui/scripts/projects.js b/ui/scripts/projects.js index ff47ac8a492..4ad032d1be7 100644 --- a/ui/scripts/projects.js +++ b/ui/scripts/projects.js @@ -647,28 +647,36 @@ }); } }, - domainid: { + + domainid: { label: 'Domain', select: function(args) { - $.ajax({ - url: createURL('listDomains'), - data: { - listAll: true, - details: 'min' - }, - success: function(json) { - var array1 = [{id: '', description: ''}]; - var domains = json.listdomainsresponse.domain; - if(domains != null && domains.length > 0) { - for(var i = 0; i < domains.length; i++) { - array1.push({id: domains[i].id, description: domains[i].path}); + if(isAdmin() || isDomainAdmin()) { + $.ajax({ + url: createURL('listDomains'), + data: { + listAll: true, + details: 'min' + }, + success: function(json) { + var array1 = [{id: '', description: ''}]; + var domains = json.listdomainsresponse.domain; + if(domains != null && domains.length > 0) { + for(var i = 0; i < domains.length; i++) { + array1.push({id: domains[i].id, description: domains[i].path}); + } } + args.response.success({ + data: array1 + }); } - args.response.success({ - data: array1 - }); - } - }); + }); + } + else { + args.response.success({ + data: null + }); + } }, isHidden: function(args) { if(isAdmin() || isDomainAdmin()) @@ -677,6 +685,7 @@ return true; } }, + account: { label: 'Account', isHidden: function(args) { diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js index 827cf4e79a0..5b47b70fe2a 100644 --- a/ui/scripts/storage.js +++ b/ui/scripts/storage.js @@ -293,29 +293,36 @@ }); } }, - + domainid: { label: 'Domain', select: function(args) { - $.ajax({ - url: createURL('listDomains'), - data: { - listAll: true, - details: 'min' - }, - success: function(json) { - var array1 = [{id: '', description: ''}]; - var domains = json.listdomainsresponse.domain; - if(domains != null && domains.length > 0) { - for(var i = 0; i < domains.length; i++) { - array1.push({id: domains[i].id, description: domains[i].path}); + if(isAdmin() || isDomainAdmin()) { + $.ajax({ + url: createURL('listDomains'), + data: { + listAll: true, + details: 'min' + }, + success: function(json) { + var array1 = [{id: '', description: ''}]; + var domains = json.listdomainsresponse.domain; + if(domains != null && domains.length > 0) { + for(var i = 0; i < domains.length; i++) { + array1.push({id: domains[i].id, description: domains[i].path}); + } } + args.response.success({ + data: array1 + }); } - args.response.success({ - data: array1 - }); - } - }); + }); + } + else { + args.response.success({ + data: null + }); + } }, isHidden: function(args) { if(isAdmin() || isDomainAdmin()) @@ -323,7 +330,8 @@ else return true; } - }, + }, + account: { label: 'Account', isHidden: function(args) { @@ -1114,28 +1122,36 @@ advSearchFields: { name: { label: 'Name' }, - domainid: { + + domainid: { label: 'Domain', select: function(args) { - $.ajax({ - url: createURL('listDomains'), - data: { - listAll: true, - details: 'min' - }, - success: function(json) { - var array1 = [{id: '', description: ''}]; - var domains = json.listdomainsresponse.domain; - if(domains != null && domains.length > 0) { - for(var i = 0; i < domains.length; i++) { - array1.push({id: domains[i].id, description: domains[i].path}); + if(isAdmin() || isDomainAdmin()) { + $.ajax({ + url: createURL('listDomains'), + data: { + listAll: true, + details: 'min' + }, + success: function(json) { + var array1 = [{id: '', description: ''}]; + var domains = json.listdomainsresponse.domain; + if(domains != null && domains.length > 0) { + for(var i = 0; i < domains.length; i++) { + array1.push({id: domains[i].id, description: domains[i].path}); + } } + args.response.success({ + data: array1 + }); } - args.response.success({ - data: array1 - }); - } - }); + }); + } + else { + args.response.success({ + data: null + }); + } }, isHidden: function(args) { if(isAdmin() || isDomainAdmin()) @@ -1144,6 +1160,7 @@ return true; } }, + account: { label: 'Account', isHidden: function(args) {