You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/04/09 23:26:37 UTC
[1/2] git commit: updated refs/heads/ui-vm-affinity to e0692b3
Updated Branches:
refs/heads/ui-vm-affinity 685a8a72c -> e0692b39d
VM multiple NICs: Fix broken UI due to API call changes
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/876e93b4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/876e93b4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/876e93b4
Branch: refs/heads/ui-vm-affinity
Commit: 876e93b441f5042fb872fd7e01c1e793988e0915
Parents: 685a8a7
Author: Brian Federle <br...@citrix.com>
Authored: Tue Apr 9 14:15:29 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Tue Apr 9 14:15:29 2013 -0700
----------------------------------------------------------------------
ui/scripts/network.js | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/876e93b4/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index cc1aad3..6f6a073 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -1186,7 +1186,7 @@
virtualmachineid: args.context.instances[0].id
},
success: function(json) {
- var ips = json.listnics.nic ? json.listnics.nic[0].secondaryip : [];
+ var ips = json.listnicsresponse.nic ? json.listnicsresponse.nic[0].secondaryip : [];
args.response.success({
data: $(ips).map(function(index, ip) {
@@ -1252,7 +1252,7 @@
virtualmachineid: args.context.instances[0].id
},
success: function(json) {
- var ips = json.listnics.nic[0].secondaryip
+ var ips = json.listnicsresponse.nic[0].secondaryip
args.response.success({
data: $.grep($(ips).map(function(index, ip) {
[2/2] git commit: updated refs/heads/ui-vm-affinity to e0692b3
Posted by bf...@apache.org.
List view UI: Fix 'no data to show' message not appearing in some cases
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e0692b39
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e0692b39
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e0692b39
Branch: refs/heads/ui-vm-affinity
Commit: e0692b39d9409fb2913b26533790f495d17beaf4
Parents: 876e93b
Author: Brian Federle <br...@citrix.com>
Authored: Tue Apr 9 14:16:01 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Tue Apr 9 14:16:01 2013 -0700
----------------------------------------------------------------------
ui/scripts/ui/widgets/listView.js | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e0692b39/ui/scripts/ui/widgets/listView.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/widgets/listView.js b/ui/scripts/ui/widgets/listView.js
index 4b88647..1c74056 100644
--- a/ui/scripts/ui/widgets/listView.js
+++ b/ui/scripts/ui/widgets/listView.js
@@ -863,7 +863,7 @@
var uiCustom = listViewArgs.uiCustom;
var subselect = uiCustom ? listViewArgs.listView.subselect : null;
- if (!data || ($.isArray(data) && !data.length)) {
+ if (!data || !data.length) {
if (!$tbody.find('tr').size()) {
return [
$('<tr>').addClass('empty').append(