From 5c36fe84b69441714c2577b40b42afaf8f65a1ce Mon Sep 17 00:00:00 2001 From: Gabor Apati-Nagy Date: Thu, 29 May 2014 15:02:29 +0100 Subject: [PATCH] CLOUDSTACK-6732: Fix:[OVS][UI] Network Service Providers page displays two ovs providers --- ui/scripts/system.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ui/scripts/system.js b/ui/scripts/system.js index 44a08a643c7..00ca1d4cace 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) {