Changeset 6126

Timestamp:

05/08/12 10:37:36 (12 years ago)

Author:

airton

Message:

Ticket #2704 - Implementar a validacao nos campos que faltam na tela de filtros de mensagens

Location:

trunk/prototype/modules/filters

Files:

• edit-filter.ejs (modified) (5 diffs)
• filters.js (modified) (5 diffs)

trunk/prototype/modules/filters/edit-filter.ejs

@@ -73 +73 @@
                                         <option value="<"><%= get_lang("is under than")%></option>
                                 </select>
-                                <input type="text" name="criteriaValue[]" />
+                                <input type="text" class="sizeRule" name="criteriaValue[]" />
                                 <input type="hidden" name="criteriaType[]" value="size"/>
                         </fieldset>
@@ -121 +121 @@
                                         %>
                                 </select>
-                                <!-- <input type="text" name="actionParameter[]" /> --> 
                         </fieldset>
                         <fieldset>
@@ -138 +137 @@
                                         <option value="seen"><%= get_lang("Seen")%></option>
                                 </select>
-                                <!-- <input type="text" name="actionParameter[]" /> -->
                         </fieldset>
                         <fieldset>
@@ -163 +161 @@
                 </div>
                 
-                
-                
                 <h3><a href="#"><%= get_lang("Apply filter")%></a></h3>
                 <div>
@@ -180 +176 @@
                         </div>
                 </div>
-                
-                
-                
-                
         </div>
         <div class="vacation-details-container hidden">

trunk/prototype/modules/filters/filters.js

@@ -1 @@
-        
 function outOfficeVerify() {    
         DataLayer.remove('filter', false);
@@ -60 +59 @@
         var criteria = "";
         var criteria_list = list_container.find('[name="criteriaValue[]"]');
+        var er_num = /^[0-9]+$/;
+        
+        if($(".sizeRule").val() != "" && er_num.test($(".sizeRule").val()) == false) {
+                $.Zebra_Dialog(get_lang("Size rule must be a number"),{
+                        'onClose':  function(caption) {
+                                list_container.find('[name="actionType[]"]:checked').parent().find("input:text, textarea").focus();
+                        }
+                });
+                accord.accordion('activate',0);
+                return false;
+        }
         $.each(criteria_list, function(index, value){
                 criteria += $.trim($(criteria_list[index]).val());
@@ -81 +91 @@
                         return false;
                 }
+                var er_mail = RegExp(/^[A-Za-z0-9_\-\.]+@[A-Za-z0-9_\-\.]{2,}\.[A-Za-z0-9]{2,}(\.[A-Za-z0-9])?/);
+                if(er_mail.test($.trim(list_container.find('[value="redirect"]:checked').parent().find("input:text, textarea").val())) == false){
+                        $.Zebra_Dialog(get_lang("Invalid mail"),{
+                                'onClose':  function(caption) {
+                                        list_container.find('[name="actionType[]"]:checked').parent().find("input:text, textarea").focus();
+                                }
+                        });
+                        return false;
+                }
         }
         return true;
@@ -132 +151 @@
         nameObj.attr("disabled", "disabled");
     for( var i = 0; i < filter.criteria.length; i++ ){
-
                 criterias.filter( '[value="' + filter.criteria[i].field + '"]' )
                 .siblings( '[name="criteriaOperator[]"]' ).val( filter.criteria[i].operator ).end()
                 .siblings( '[name="criteriaValue[]"]' ).val( filter.criteria[i].value );
-
     }
-
-        
     for( var i = 0; i < filter.actions.length; i++ ){
                 actions.filter( '[value="' + filter.actions[i].type + '"]' ).attr("checked", "True");
@@ -151 +166 @@
                         actions.parent().find('[value="'+filter.actions[i].parameter+'"]').attr("selected", "selected");
     }
-  
     //isExact.val( filter.isExact != "false"? "and" : "or" );
         isExact.filter('[value="'+(filter.isExact != "false"? "and" : "or")+'"]').attr("checked", "True");