cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jessicaw...@apache.org
Subject git commit: updated refs/heads/master to a6c6f48
Date Sat, 10 Aug 2013 20:27:35 GMT
Updated Branches:
  refs/heads/master 4bdaffb66 -> a6c6f4851


revert 12ca1d9102483c71f5008de846b861de317b0f36 since it's a partial UI change.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a6c6f485
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a6c6f485
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a6c6f485

Branch: refs/heads/master
Commit: a6c6f4851b595dc68ff6254df2f9feb8699b8883
Parents: 4bdaffb
Author: Jessica Wang <jessica.wang@citrix.com>
Authored: Sat Aug 10 13:26:48 2013 -0700
Committer: Jessica Wang <jessica.wang@citrix.com>
Committed: Sat Aug 10 13:26:48 2013 -0700

----------------------------------------------------------------------
 ui/scripts/ui-custom/zoneWizard.js | 31 ++++++-------------------------
 1 file changed, 6 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a6c6f485/ui/scripts/ui-custom/zoneWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/zoneWizard.js b/ui/scripts/ui-custom/zoneWizard.js
index 64dac26..8af873e 100644
--- a/ui/scripts/ui-custom/zoneWizard.js
+++ b/ui/scripts/ui-custom/zoneWizard.js
@@ -295,36 +295,17 @@
             var trafficData = $trafficType.data('traffic-type-data') ?
                 $trafficType.data('traffic-type-data') : {};
             var hypervisor = getData($trafficType.closest('.zone-wizard')).zone.hypervisor;
-            var fields = {
-                label: {
-                    label: hypervisor + ' ' + _l('label.traffic.label'),
-                    defaultValue: trafficData.label
-                }
-            };
-
-            if (hypervisor === 'VMware') {
-                $.extend(fields, {
-                    vlanid: { label: 'VLAN ID' },
-                    switchType: {
-                        label: 'label.switch.type',
-                        select: function(args) {
-                            args.response.success({
-                                data: [
-                                    { id: 'vmwaresvs', description: 'VMware SVS' },
-                                    { id: 'vmwaredvs', description: 'VMware DVS' },
-                                    { id: 'nexusdvs', description: 'Nexus DVS' }
-                                ]
-                            });
-                        }
-                    }
-                });
-            }
 
             cloudStack.dialog.createForm({
                 form: {
                     title: _l('label.edit.traffic.type'),
                     desc: _l('message.edit.traffic.type'),
-                    fields: fields
+                    fields: {
+                        label: {
+                            label: hypervisor + ' ' + _l('label.traffic.label'),
+                            defaultValue: trafficData.label
+                        }
+                    }
                 },
 
                 after: function(args) {


Mime
View raw message