Changeset 4576 for branches/2.2.0.1/expressoMail1_2/js/filters.js

Timestamp:

06/02/11 14:59:41 (13 years ago)

Author:

rafaelraymundo

Message:

Ticket #1726 - Criacao de filtros para utilizar o tamanho da mensagem. r4552

File:

• branches/2.2.0.1/expressoMail1_2/js/filters.js (modified) (3 diffs)

branches/2.2.0.1/expressoMail1_2/js/filters.js

@@ -149 +149 @@
         var fields = rule.split("&&");
         if(type == 'voip')
+        {
                 return " <a href='javascript:void(0)' onclick=filter.form_r('"+pos+"','voip')><b>" + get_lang("Status") + " : </b>" + "<font color='red'>" + get_lang(fields[2]) + "</font>" + " - " + fields[3] + " <b>" + get_lang("Subject") + ":</b> " + fields[5] + "</a>";
-        else{ 
+        }
+        else
+        {
                 var _criteria = " "; 
                 if (fields[3].length > 0) 
@@ -158 +161 @@
                 if (fields[5].length > 0) 
                         _criteria += "<b>&nbsp;"+get_lang("subject is")+"</b>:"+fields[5]; 
-                if (parseInt(fields[11]) >= 0)
-                { 
-                        if(fields[8] == "1")
-                                _criteria += "<b>&nbsp;"+get_lang("size is over than")+"</b>:"+fields[11]; 
-                        else if(fields[8] != "0")
-                                _criteria += "<b>&nbsp;"+get_lang("size is under than")+"</b>:"+fields[11]; 
-                } 
+                if ( parseInt( fields[11] ) > 0 )
+                {
+                    if( fields[8] == "2" || fields[8] == "10" )
+                        _criteria += "<b>&nbsp;"+get_lang("size is over than")+"</b>:"+fields[11];
+
+                    if( fields[8] == "0" || fields[8] == "8" )
+                        _criteria += "<b>&nbsp;"+get_lang("size is under than")+"</b>:"+fields[11];
+                }
+
                 var _action = " "; 
                 if (fields[6] == 'folder') 
@@ -179 +184 @@
 }
         
-        cfilterSh.prototype.vl_outOffice = function(outOffice){         
+        cfilterSh.prototype.vl_outOffice = function(outOffice)
+        {
                 var aux = outOffice.split("&&");
                 return get_lang("Rule") + " - <a href='javascript:void(0)' onclick=filter.form_out()> " + "<b>" + get_lang("Status") + " : </b><font color='red'>" + (aux[4] == "off" ? get_lang("Disabled") : get_lang("Enabled")) + "</font></a>";