Changeset 6143

Timestamp:

05/08/12 17:13:54 (12 years ago)

Author:

airton

Message:

Ticket #2708 - Inconsistencia na coluna De no grid de mensagens na tela de filtros

File:

• trunk/prototype/modules/filters/filters.js (modified) (7 diffs)

trunk/prototype/modules/filters/filters.js

@@ -73 +73 @@
                 criteria += $.trim($(criteria_list[index]).val());
         });
-        if(criteria == ""){
+        if(criteria == "" && ($(".hasAttachment").is(':checked')) == false){
                 $.Zebra_Dialog(get_lang("No criteria filled"),{
                         'onClose':  function(caption) {
@@ -177 +177 @@
       if( form.vacation )
           return {
-
                 criteria: [{ value: "vacation", operator: "", field: "vacation" }],
                 actions: [{ parameter: form.vacation, type: "vacation" }],
@@ -187 +186 @@
       }
 
-          var apply_messages_ = keys(selectedMessages);
-          delete selectedMessages; 
-
-      return {
+        var apply_messages_ = keys(selectedMessages);
+        delete selectedMessages; 
+
+    return {
                 //id: form.name,
                 name: form.name ? form.name : nameObj.val(),
@@ -196 +195 @@
                 criteria: $.map( form.criteriaOperator || [], function( criteriaOperator, i ){  
                         return (!form.criteriaValue[i]) ? null:
-                                {value:  form.criteriaValue[i],
-                                  operator: criteriaOperator,
-                                  field:  form.criteriaType[i]};
-
+                        { 
+                                        value:  form.criteriaValue[i],
+                                        operator: criteriaOperator,
+                                        field:  form.criteriaType[i]
+                        };
                 }),
                 actions: $.map( form.actionType || [], function( type, i ){
@@ -229 +229 @@
                                 the_parameter = form.valueSetFlag;
                         }
-                        
                         return (!type) ? null:
                               {parameter: the_parameter, type: type };
@@ -239 +238 @@
                 applyMessages: apply_messages_ 
                 //applyMessages: ""
-      };
+    };
   },
   
@@ -386 +385 @@
                                 datatype: "json",
                                 mtype: 'GET',
-                                colNames:['#', ' ', 'De', 'Assunto', 'Data', 'Tamanho'],
+                                colNames:['#', 'De', 'Assunto', 'Data', 'Tamanho'],
                                 colModel:[
                                         {name:'msg_number',index:'msg_number', width:45, hidden:true, sortable:false},
-                                        {name:'flags',index:'msg_number', width:40, sortable:false, formatter:flags2Class},
-                                        {name:'from.name',index:'msg_number', width:130, sortable:false},
+                                        {name:'from.email',index:'msg_number', width:130, sortable:false},
                                         {name:'subject',index:'subject', width:250, sortable:false},
                                         {name:'timestamp',index:'timestamp', width:65, align:"center", sortable:false, formatter:date2Time},