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

CLOUDSTACK-7462: UI > Network > VPC > Router > Network ACL Lists > click an entry from list > Details tab > ACL List Rules tab > click Edit icon on any existing rule > fix the JavaScript error "args.jsonObj is undefined".

This commit is contained in:
Jessica Wang 2014-09-10 15:35:53 -07:00
parent 7a555b398f
commit a39bf18bc7
1 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
ui/scripts/sharedFunctions.js
View File

@ -2173,42 +2173,42 @@ cloudStack.api = {
}
},
dataProvider: function(args) {
args.response.success({
data: args.jsonObj.tags
});
/*
var resourceId = args.context[contextId][0].id;
var data = {
resourceId: resourceId,
resourceType: resourceType
};
if (args.jsonObj != undefined) {
args.response.success({
data: args.jsonObj.tags
});
} else {
var resourceId = args.context[contextId][0].id;
var data = {
resourceId: resourceId,
resourceType: resourceType
};
if (isAdmin() || isDomainAdmin()) {
data.listAll = true;
}
if (args.context.projects) {
data.projectid = args.context.projects[0].id;
}
if (args.jsonObj != null && args.jsonObj.projectid != null && data.projectid == null) {
data.projectid = args.jsonObj.projectid;
}
$.ajax({
url: createURL('listTags'),
data: data,
success: function(json) {
args.response.success({
data: json.listtagsresponse ? json.listtagsresponse.tag : []
});
},
error: function(json) {
args.response.error(parseXMLHttpResponse(json));
if (isAdmin() || isDomainAdmin()) {
data.listAll = true;
}
});
*/
if (args.context.projects) {
data.projectid = args.context.projects[0].id;
}
if (args.jsonObj != null && args.jsonObj.projectid != null && data.projectid == null) {
data.projectid = args.jsonObj.projectid;
}
$.ajax({
url: createURL('listTags'),
data: data,
success: function(json) {
args.response.success({
data: json.listtagsresponse ? json.listtagsresponse.tag : []
});
},
error: function(json) {
args.response.error(parseXMLHttpResponse(json));
}
});
}
}
};
}