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/02/21 22:45:19 UTC
[49/51] [abbrv] Merge branch 'master' into ui-quick-view-v2
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2f5e6c98/ui/css/cloudstack3.css
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2f5e6c98/ui/scripts/instances.js
----------------------------------------------------------------------
diff --cc ui/scripts/instances.js
index b1443d1,264b5a1..76ca693
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@@ -231,34 -419,7 +419,34 @@@
detailView: {
name: 'Instance details',
- viewAll: [{ path: 'storage.volumes', label: 'label.volumes' }, { path: 'vmsnapshots', label: 'Snapshots' } ],
+ viewAll: [
+ { path: 'storage.volumes', label: 'label.volumes' },
- { path: 'storage.snapshots', label: 'label.snapshots' },
++ { path: 'vmsnapshots', label: 'label.snapshots' },
+ {
+ path: '_zone.hosts',
+ label: 'label.hosts',
+ preFilter: function(args) {
+ return isAdmin();
+ },
+ updateContext: function(args) {
+ var instance = args.context.instances[0];
+ var zone;
+
+ $.ajax({
+ url: createURL('listZones'),
+ data: {
+ id: instance.zoneid
+ },
+ async: false,
+ success: function(json) {
+ zone = json.listzonesresponse.zone[0]
+ }
+ });
+
+ return { zones: [zone] };
+ }
+ }
+ ],
tabFilter: function(args) {
var hiddenTabs = [];
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2f5e6c98/ui/scripts/storage.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2f5e6c98/ui/scripts/system.js
----------------------------------------------------------------------