Updated Branches: refs/heads/master 5060f9826 -> 29459549b
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/29459549 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/29459549 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/29459549 Branch: refs/heads/master Commit: 29459549ba883c9dd15d553da71681d2875501d2 Parents: 5060f98 Author: Mice Xia <[email protected]> Authored: Tue Aug 14 13:42:40 2012 +0800 Committer: Mice Xia <[email protected]> Committed: Tue Aug 14 13:43:09 2012 +0800 ---------------------------------------------------------------------- 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/29459549/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/29459549/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 }
