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/4.2 to 6940d25
Date Fri, 02 Aug 2013 21:38:49 GMT
Updated Branches:
  refs/heads/4.2 612ac971b -> 6940d256c


CLOUDSTACK-2569: UI > Infrastructure > zone > physical network > VNMC provider
> fix a bug that queryAsyncJobResult API kept being called even after the async job was
finished.


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

Branch: refs/heads/4.2
Commit: 6940d256c9b0e3161f5cda7838b614c8a84fb899
Parents: 612ac97
Author: Jessica Wang <jessicawang@apache.org>
Authored: Fri Aug 2 14:21:15 2013 -0700
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Fri Aug 2 14:38:40 2013 -0700

----------------------------------------------------------------------
 .../vnmcNetworkProvider/vnmcNetworkProvider.js  | 29 +++++---------------
 1 file changed, 7 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6940d256/ui/modules/vnmcNetworkProvider/vnmcNetworkProvider.js
----------------------------------------------------------------------
diff --git a/ui/modules/vnmcNetworkProvider/vnmcNetworkProvider.js b/ui/modules/vnmcNetworkProvider/vnmcNetworkProvider.js
index 2e1e12e..f1d22d1 100644
--- a/ui/modules/vnmcNetworkProvider/vnmcNetworkProvider.js
+++ b/ui/modules/vnmcNetworkProvider/vnmcNetworkProvider.js
@@ -376,15 +376,14 @@
                                                 jobid: jid
                                             },
                                             success: function (json) {
-                                                var result = json.queryasyncjobresultresponse;
+                                                var result = json.queryasyncjobresultresponse;
                                               
                                                 if (result.jobstatus == 0) {
                                                     return; //Job has not completed
                                                 } else {
+                                                	clearInterval(enableVnmcProviderIntervalID);
                                                     if (result.jobstatus == 1) {
                                                         args.response.success({
-                                                            data: {
-                                                                state: 'Enabled'
-                                                            }
+                                                            data: result.jobresult.networkserviceprovider
                                                         });
                                                     } else if (result.jobstatus == 2) {
                                                         args.response.error(_s(result.jobresult.errortext));
@@ -419,13 +418,7 @@
                                 }
                             });
                         }
-                    },
-
-                    notification: {
-                        poll: function (args) {
-                            args.complete();
-                        }
-                    }
+                    }                    
                 },
 
                 disable: {
@@ -475,16 +468,14 @@
                                                 jobid: jid
                                             },
                                             success: function (json) {
-                                                var result = json.queryasyncjobresultresponse;
+                                                var result = json.queryasyncjobresultresponse;
                                            
                                                 if (result.jobstatus == 0) {
                                                     return; //Job has not completed
                                                 } else {
                                                     clearInterval(disableVnmcProviderIntervalID);
                                                     if (result.jobstatus == 1) {
                                                         args.response.success({
-                                                            data: {
-                                                                state: 'Disabled'
-                                                            }
+                                                            data: result.jobresult.networkserviceprovider
                                                         });
                                                     } else if (result.jobstatus == 2) {
                                                         args.response.error(_s(result.jobresult.errortext));
@@ -519,13 +510,7 @@
                                 }
                             });
                         }
-                    },
-
-                    notification: {
-                        poll: function (args) {
-                            args.complete();
-                        }
-                    }
+                    }                    
                 }
             },
             tabs: {


Mime
View raw message