cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jessicaw...@apache.org
Subject git commit: updated refs/heads/master to 12e295d
Date Mon, 16 Sep 2013 20:59:17 GMT
Updated Branches:
  refs/heads/master 51da534cc -> 12e295d75


CLOUDSTACK-4687: UI > listView widget > actions in a grid row > when an action is
completed, refresh the grid row with only data returned by getUpdatedItem() instead of combination
of data returned by getUpdatedItem() and original embedded data in grid row.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/12e295d7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/12e295d7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/12e295d7

Branch: refs/heads/master
Commit: 12e295d7578b4259dd13002c51f786029e54df7f
Parents: 51da534
Author: Jessica Wang <jessicawang@apache.org>
Authored: Mon Sep 16 13:52:54 2013 -0700
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Mon Sep 16 13:59:05 2013 -0700

----------------------------------------------------------------------
 ui/scripts/system.js              | 20 ++++++++++----------
 ui/scripts/ui/widgets/listView.js |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/12e295d7/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index a3643f3..9a43087 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -14032,25 +14032,25 @@
                                                                 	/*
                                                                 	json = {
                                                                 		    "queryasyncjobresultresponse":
{
-                                                                		        "accountid": "b24f6e36-f0ca-11e2-8c16-d637902e3581",
-                                                                		        "userid": "b24f7d8d-f0ca-11e2-8c16-d637902e3581",
-                                                                		        "cmd": "org.apache.cloudstack.api.AssociateUcsProfileToBladeCmd",
+                                                                		        "accountid": "835fb2d5-0b76-11e3-9350-f4f3e49b5dfe",
+                                                                		        "userid": "835fc0e5-0b76-11e3-9350-f4f3e49b5dfe",
+                                                                		        "cmd": "org.apache.cloudstack.api.DisassociateUcsProfileCmd",
                                                                 		        "jobstatus": 1,
                                                                 		        "jobprocstatus":
0,
                                                                 		        "jobresultcode":
0,
                                                                 		        "jobresulttype":
"object",
                                                                 		        "jobresult": {
                                                                 		            "ucsblade":
{
-                                                                		                "id": "80ab25c8-3dcf-400e-8849-84dc5e1e6594",
-                                                                		                "ucsmanagerid":
"07b5b813-83ed-4859-952c-c95cafb63ac4",
-                                                                		                "bladedn":
"sys/chassis-1/blade-4"
+                                                                		                "id": "f8d08575-7a1c-4f79-a588-d129c38bcc4f",
+                                                                		                "ucsmanagerid":
"0d87c1a6-5664-425c-9024-2ddd9605d260",
+                                                                		                "bladedn":
"sys/chassis-1/blade-1"
                                                                 		            }
                                                                 		        },
-                                                                		        "created": "2013-07-26T13:53:01-0700",
-                                                                		        "jobid": "770bec68-7739-4127-8609-4b87bd7867d2"
+                                                                		        "created": "2013-09-13T22:17:29-0700",
+                                                                		        "jobid": "2c3698a8-39ac-43e6-8ade-86eb2d3726a0"
                                                                 		    }
-                                                                		};
-                                                                	*/
+                                                                		}; 
+                                                                	*/       
                                                                 	//for testing only (end)
                                                                 	                       
                                        	                                  	    
                                                                     return json.queryasyncjobresultresponse.jobresult.ucsblade;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/12e295d7/ui/scripts/ui/widgets/listView.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/widgets/listView.js b/ui/scripts/ui/widgets/listView.js
index 0745c41..076b3ab 100644
--- a/ui/scripts/ui/widgets/listView.js
+++ b/ui/scripts/ui/widgets/listView.js
@@ -212,7 +212,7 @@
                                             if ($instanceRow.is(':visible')) {
                                                 if (args.data) {
                                                     $newRow = replaceItem($instanceRow,
-                                                        $.extend($instanceRow.data('json-obj'),
args.data),
+                                                    	args.data, //$.extend($instanceRow.data('json-obj'),
args.data), /* $.extend($instanceRow.data('json-obj'), args.data) causes CLOUDSTACK-4687 */
                                                         actionFilter);
                                                 } else {
                                                     // Nothing new, so just put in existing
data


Mime
View raw message