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 2014/10/28 22:26:00 UTC
[2/3] git commit: updated refs/heads/master to efb3287
CLOUDSTACK-7718: No Field Validations on Zone Form
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/985168ab
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/985168ab
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/985168ab
Branch: refs/heads/master
Commit: 985168ab4bd884295de05b1fd50e204c0a0c49c4
Parents: 7489572
Author: Gabor Apati-Nagy <ga...@citrix.com>
Authored: Tue Oct 14 18:39:35 2014 +0100
Committer: Brian Federle <br...@citrix.com>
Committed: Tue Oct 28 14:22:51 2014 -0700
----------------------------------------------------------------------
ui/scripts/zoneWizard.js | 44 ++++++++++++++++++++++++++++++++-----------
1 file changed, 33 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/985168ab/ui/scripts/zoneWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index 3ed83f0..9fccb8b 100755
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -177,11 +177,17 @@
},
'startip': {
edit: true,
- label: 'label.start.IP'
+ label: 'label.start.IP',
+ validation: {
+ ipv4: true
+ }
},
'endip': {
edit: true,
- label: 'label.end.IP'
+ label: 'label.end.IP',
+ validation: {
+ ipv4: true
+ }
},
'add-rule': {
label: 'label.add',
@@ -421,34 +427,48 @@
ip4dns1: {
label: 'label.ipv4.dns1',
validation: {
- required: true
+ required: true,
+ ipv4: true
},
desc: 'message.tooltip.dns.1'
},
ip4dns2: {
label: 'label.ipv4.dns2',
- desc: 'message.tooltip.dns.2'
+ desc: 'message.tooltip.dns.2',
+ validation: {
+ ipv4: true
+ }
},
ip6dns1: {
label: 'label.ipv6.dns1',
- desc: 'message.tooltip.dns.1'
+ desc: 'message.tooltip.dns.1',
+ validation: {
+ ipv6: true
+ }
},
ip6dns2: {
label: 'label.ipv6.dns2',
- desc: 'message.tooltip.dns.2'
- },
+ desc: 'message.tooltip.dns.2',
+ validation: {
+ ipv6: true
+ }
+ },
internaldns1: {
label: 'label.internal.dns.1',
validation: {
- required: true
+ required: true,
+ ipv4: true
},
desc: 'message.tooltip.internal.dns.1'
},
internaldns2: {
label: 'label.internal.dns.2',
- desc: 'message.tooltip.internal.dns.2'
+ desc: 'message.tooltip.internal.dns.2',
+ validation: {
+ ipv4: true
+ },
},
hypervisor: {
label: 'label.hypervisor',
@@ -713,13 +733,15 @@
reservedSystemStartIp: {
label: 'label.start.reserved.system.IP',
validation: {
- required: true
+ required: true,
+ ipv4: true
}
},
reservedSystemEndIp: {
label: 'label.end.reserved.system.IP',
validation: {
- required: false
+ required: false,
+ ipv4: true
}
}
}