You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by je...@apache.org on 2014/09/26 21:03:28 UTC
git commit: updated refs/heads/master to 59b0103
Repository: cloudstack
Updated Branches:
refs/heads/master 402a3323f -> 59b0103a5
CLOUDSTACK-7637: UI > fix a bug produced by 4.5 feature "template accross multiple zones" > fix it by including all properties to jsonObj.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/59b0103a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/59b0103a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/59b0103a
Branch: refs/heads/master
Commit: 59b0103a5325074e0e0c105a9afd2b39a5e1117b
Parents: 402a332
Author: Jessica Wang <je...@citrix.com>
Authored: Fri Sep 26 12:02:48 2014 -0700
Committer: Jessica Wang <je...@citrix.com>
Committed: Fri Sep 26 12:02:48 2014 -0700
----------------------------------------------------------------------
ui/scripts/templates.js | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/59b0103a/ui/scripts/templates.js
----------------------------------------------------------------------
diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index d71a774..9665ffd 100644
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
@@ -622,15 +622,10 @@
});
if (existing.length == 0) {
- itemsView.push({
- id: item.id,
- name: item.name,
- description: item.description,
- hypervisor: item.hypervisor,
- ostypeid: item.ostypeid,
+ itemsView.push($.extend(item, {
zones: item.zonename,
zoneids: [item.zoneid]
- });
+ }));
}
else {
existing[0].zones = 'label.multiplezones';