You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2012/08/15 21:58:27 UTC
[8/10] git commit: Fix a bug: zoneWizard uses incorrect vlan
parameter to create storage network
Fix a bug: zoneWizard uses incorrect vlan parameter to create storage network
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/3ea36fb7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/3ea36fb7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/3ea36fb7
Branch: refs/heads/asf-4.0
Commit: 3ea36fb7370a8b1ffe046e8d75f2709d9a3ab02f
Parents: 9a4ee38
Author: Mice Xia <mi...@apache.org>
Authored: Tue Aug 14 13:42:40 2012 +0800
Committer: Alex Huang <al...@citrix.com>
Committed: Wed Aug 15 12:00:04 2012 -0700
----------------------------------------------------------------------
ui/scripts/ui-custom/zoneWizard.js | 2 +-
ui/scripts/zoneWizard.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3ea36fb7/ui/scripts/ui-custom/zoneWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/zoneWizard.js b/ui/scripts/ui-custom/zoneWizard.js
index 3f26cda..c1e8f7c 100644
--- a/ui/scripts/ui-custom/zoneWizard.js
+++ b/ui/scripts/ui-custom/zoneWizard.js
@@ -127,7 +127,7 @@
var fields = [
'gateway',
'netmask',
- 'vlanid',
+ 'vlan',
'startip',
'endip'
];
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3ea36fb7/ui/scripts/zoneWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index c3a2b4e..79ef423 100644
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -157,7 +157,7 @@
fields: {
'gateway': { edit: true, label: 'label.gateway' },
'netmask': { edit: true, label: 'label.netmask' },
- 'vlanid': { edit: true, label: 'label.vlan', isOptional: true },
+ 'vlan': { edit: true, label: 'label.vlan', isOptional: true },
'startip': { edit: true, label: 'label.start.IP' },
'endip': { edit: true, label: 'label.end.IP' },
'add-rule': { label: 'label.add', addButton: true }