You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by je...@apache.org on 2014/09/11 22:35:58 UTC
git commit: updated refs/heads/4.4 to aa81823
Repository: cloudstack
Updated Branches:
refs/heads/4.4 f7d9ea291 -> aa81823ce
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".
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/aa81823c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/aa81823c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/aa81823c
Branch: refs/heads/4.4
Commit: aa81823ce81540d83f3d14f3eceffa2783bfaaf5
Parents: f7d9ea2
Author: Jessica Wang <je...@apache.org>
Authored: Thu Sep 11 13:35:28 2014 -0700
Committer: Jessica Wang <je...@apache.org>
Committed: Thu Sep 11 13:35:28 2014 -0700
----------------------------------------------------------------------
ui/scripts/sharedFunctions.js | 66 +++++++++++++++++++-------------------
1 file changed, 33 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aa81823c/ui/scripts/sharedFunctions.js
----------------------------------------------------------------------
diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js
index f58fdd2..1ed90c2 100644
--- a/ui/scripts/sharedFunctions.js
+++ b/ui/scripts/sharedFunctions.js
@@ -2089,42 +2089,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 (isAdmin() || isDomainAdmin()) {
- data.listAll = true;
- }
-
- if (args.context.projects) {
- data.projectid = args.context.projects[0].id;
- }
+ 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.jsonObj != null && args.jsonObj.projectid != null && data.projectid == null) {
- data.projectid = args.jsonObj.projectid;
- }
+ if (args.context.projects) {
+ data.projectid = args.context.projects[0].id;
+ }
- $.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 (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));
+ }
+ });
+ }
}
};
}