cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [1/3] git commit: updated refs/heads/4.3 to 40743e9
Date Tue, 09 Dec 2014 11:58:31 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.3 1e09494a4 -> 40743e933


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.yadav@shapeblue.com>


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

Branch: refs/heads/4.3
Commit: 2f7f2793a58990dd6cc3aef7225a7c60ddf9b924
Parents: 1e09494
Author: Rohit Yadav <rohit.yadav@shapeblue.com>
Authored: Tue Dec 9 15:05:17 2014 +0530
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Tue Dec 9 15:19:53 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/2f7f2793/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 9d3b6ae..aa0862e 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -4465,19 +4465,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,
@@ -4492,10 +4484,7 @@
                                         'cidr': {
                                             edit: true,
                                             label: 'label.cidr',
-                                            isHidden: true,
-                                            validation: {
-                                                ipv4cidr: true
-                                            }
+                                            isHidden: true
                                         },
                                         'accountname': {
                                             edit: true,
@@ -4671,19 +4660,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,
@@ -4698,10 +4679,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/2f7f2793/ui/scripts/ui/widgets/multiEdit.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/widgets/multiEdit.js b/ui/scripts/ui/widgets/multiEdit.js
index 8f49da2..873775d 100755
--- a/ui/scripts/ui/widgets/multiEdit.js
+++ b/ui/scripts/ui/widgets/multiEdit.js
@@ -971,10 +971,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);
@@ -1226,11 +1222,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;
     };
 


Mime
View raw message