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 5c36fe8
Date Thu, 26 Jun 2014 18:40:54 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 80ef915fd -> 5c36fe84b


CLOUDSTACK-6732: Fix:[OVS][UI] Network Service Providers page displays two ovs providers


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

Branch: refs/heads/master
Commit: 5c36fe84b69441714c2577b40b42afaf8f65a1ce
Parents: 80ef915
Author: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
Authored: Thu May 29 15:02:29 2014 +0100
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Thu Jun 26 11:40:35 2014 -0700

----------------------------------------------------------------------
 ui/scripts/system.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5c36fe84/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 44a08a6..00ca1d4 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -6177,7 +6177,7 @@
                                     args.response.success({
                                         actionFilter: virtualRouterProviderActionFilter,
                                         data: $.extend(nspMap[ "Ovs"], {
-                                            supportedServices: nspMap[ "Ovs"].servicelist.join(',
')
+                                            supportedServices: nspMap["Ovs"] == undefined?
"": nspMap["Ovs"].servicelist.join(', ')
                                         })
                                     });
                                 }
@@ -19444,11 +19444,14 @@
             });
         }
         
+        if ($.grep(nspHardcodingArray, function(e) { return e.id == 'Ovs'; }).length == 0
) {
         nspHardcodingArray.push({
-            id: 'OVS',
-            name: 'OVS',
+                id: 'Ovs',
+                name: 'Ovs',
             state: nspMap.Ovs ? nspMap.Ovs.state : 'Disabled'
         });        
+        }
+
     };
     
     cloudStack.actionFilter.physicalNetwork = function (args) {


Mime
View raw message