You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/11/28 22:25:21 UTC
[1/2] git commit: updated refs/heads/master to e4e685b
Repository: cloudstack
Updated Branches:
refs/heads/master 39a4a9d19 -> e4e685b29
ui: Fix undefined check in instances.js, regression from 459d638
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0bbd9a06
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0bbd9a06
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0bbd9a06
Branch: refs/heads/master
Commit: 0bbd9a06a97f4e7a0e85cc0f9f015811effad23a
Parents: 5b8fc22
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Wed Nov 25 14:17:32 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed Nov 25 14:17:32 2015 +0530
----------------------------------------------------------------------
ui/scripts/instances.js | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0bbd9a06/ui/scripts/instances.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 9d63751..416c77c 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -397,11 +397,13 @@
data: data,
success: function(json) {
var items = json.listvirtualmachinesresponse.virtualmachine;
- $.each(items, function(idx, vm) {
- if (vm.nic && vm.nic.length > 0 && vm.nic[0].ipaddress) {
- items[idx].ipaddress = vm.nic[0].ipaddress;
- }
- });
+ if (items) {
+ $.each(items, function(idx, vm) {
+ if (vm.nic && vm.nic.length > 0 && vm.nic[0].ipaddress) {
+ items[idx].ipaddress = vm.nic[0].ipaddress;
+ }
+ });
+ }
args.response.success({
data: items
});
[2/2] git commit: updated refs/heads/master to e4e685b
Posted by bh...@apache.org.
Merge pull request #1119 from shapeblue/master-instancesjsfix
[master] ui: Fix undefined check in instances.js, regression from 459d638(fix is already included in the https://github.com/apache/cloudstack/pull/1106 for 4.6 as well)
* pr/1119:
ui: Fix undefined check in instances.js, regression from 459d638
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e4e685b2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e4e685b2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e4e685b2
Branch: refs/heads/master
Commit: e4e685b29183b13a238caca0ca8f572ff8adfff1
Parents: 39a4a9d 0bbd9a0
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Sun Nov 29 02:54:24 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Sun Nov 29 02:54:24 2015 +0530
----------------------------------------------------------------------
ui/scripts/instances.js | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e4e685b2/ui/scripts/instances.js
----------------------------------------------------------------------