Revert "CLOUDSTACK-7766: Field Validations Missing for Ingress and Egress Rules"
This breaks validations such as ingress/egress rules on Security Group on the UI so reverting this. This reverts commit ca8ecc0470191eb35788429a7afcf604ee3d389c. Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1971b432 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1971b432 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1971b432 Branch: refs/heads/4.4 Commit: 1971b432c3a4d191956597f9acea2694067c5c06 Parents: 2e76d31 Author: Rohit Yadav <rohit.ya...@shapeblue.com> Authored: Tue Dec 9 15:05:17 2014 +0530 Committer: Rohit Yadav <rohit.ya...@shapeblue.com> Committed: Thu Dec 11 21:59:14 2014 +0530 ---------------------------------------------------------------------- ui/scripts/network.js | 34 ++++++--------------------------- ui/scripts/ui/widgets/multiEdit.js | 9 --------- 2 files changed, 6 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1971b432/ui/scripts/network.js ---------------------------------------------------------------------- diff --git a/ui/scripts/network.js b/ui/scripts/network.js index cdea04c..bc2436f8 100755 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -4727,19 +4727,11 @@ }, 'startport': { edit: true, - label: 'label.start.port', - validation: { - number: true, - range: [0, 65535] - } + label: 'label.start.port' }, 'endport': { edit: true, - label: 'label.end.port', - validation: { - number: true, - range: [0, 65535] - } + label: 'label.end.port' }, 'icmptype': { edit: true, @@ -4754,10 +4746,7 @@ 'cidr': { edit: true, label: 'label.cidr', - isHidden: true, - validation: { - ipv4cidr: true - } + isHidden: true }, 'accountname': { edit: true, @@ -4937,19 +4926,11 @@ }, 'startport': { edit: true, - label: 'label.start.port', - validation: { - number: true, - range: [0, 65535] - } + label: 'label.start.port' }, 'endport': { edit: true, - label: 'label.end.port', - validation: { - number: true, - range: [0, 65535] - } + label: 'label.end.port' }, 'icmptype': { edit: true, @@ -4964,10 +4945,7 @@ 'cidr': { edit: true, label: 'label.cidr', - isHidden: true, - validation: { - ipv4cidr: true - } + isHidden: true }, 'accountname': { edit: true, http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1971b432/ui/scripts/ui/widgets/multiEdit.js ---------------------------------------------------------------------- diff --git a/ui/scripts/ui/widgets/multiEdit.js b/ui/scripts/ui/widgets/multiEdit.js index 861dc03..47e5f43 100755 --- a/ui/scripts/ui/widgets/multiEdit.js +++ b/ui/scripts/ui/widgets/multiEdit.js @@ -992,10 +992,6 @@ .attr('disabled', field.isDisabled ? 'disabled' : false) .appendTo($td); - if (field.validation) { - $td.find('input').first().data("validation-settings", field.validation ); - } - if (field.isDisabled) $input.hide(); if (field.defaultValue) { $input.val(field.defaultValue); @@ -1247,11 +1243,6 @@ $multiForm.validate(); - var inputs = $multiForm.find('input'); - $.each(inputs, function() { - if ($(this).data && $(this).data('validation-settings')) - $(this).rules('add', $(this).data('validation-settings')); - }); return this; };
