You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/07/28 16:04:50 UTC
[38/50] git commit: updated refs/heads/4.4 to d5220a8
CLOUDSTACK-6732: Fix:[OVS][UI] Network Service Providers page displays two ovs providers
(cherry picked from commit 6d5d48f460438c7df43e3d0e3da9bd91866c53d5)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b0c6de63
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b0c6de63
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b0c6de63
Branch: refs/heads/4.4
Commit: b0c6de63fdf27e4843eae30b0cddad9649e91b84
Parents: 446899d
Author: Gabor Apati-Nagy <ga...@citrix.com>
Authored: Thu May 29 15:02:29 2014 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Mon Jul 28 16:02:47 2014 +0200
----------------------------------------------------------------------
ui/scripts/system.js | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b0c6de63/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index e6fb7a6..d619906 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(', ')
})
});
}
@@ -19434,11 +19434,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) {