Changeset 3026 for branches/2.2/expressoMail1_2/js/filters.js

Timestamp:

07/09/10 16:11:09 (14 years ago)

Author:

amuller

Message:

Ticket #1109 - Refazendo a tela de filtros do ExpressoMail1_2

File:

• branches/2.2/expressoMail1_2/js/filters.js (modified) (1 diff)

branches/2.2/expressoMail1_2/js/filters.js

@@ -146 +146 @@
         
         cfilterSh.prototype.vl_rule = function(rule,pos,type)
-        {
-                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
-                        return " <a href='javascript:void(0)' onclick=filter.form_r('"+pos+"','')><b>" + get_lang("Status") + " : </b>" + "<font color='red'>" + get_lang(fields[2]) + "</font>" + " - <b>" + get_lang("E-mail rule") + ":</b> " + fields[3] + " - <b>" + get_lang("Action") + ":</b> " + fields[6] + "</a>";
-        }
+{
+        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{ 
+
+                var _criteria = " "; 
+                if (fields[3].length > 0) 
+                        _criteria = "<b>"+get_lang("is from")+"</b>:"+fields[3]; 
+                if (fields[4].length > 0) 
+                        _criteria += "<b>"+get_lang("is to")+"</b>:"+fields[4]; 
+                if (fields[5].length > 0) 
+                        _criteria += "<b>"+get_lang("subject is")+"</b>:"+fields[5]; 
+                if (parseInt(fields[11]) > 0) 
+                { 
+                        if(fields[8] == "2") 
+                                _criteria += "<b>"+get_lang("size is over than")+"</b>:"+fields[11]; 
+                        else 
+                                _criteria += "<b>"+get_lang("size is under than")+"</b>:"+fields[11]; 
+                } 
+                var _action = " "; 
+                if (fields[6] == 'folder') 
+                        _action = get_lang("Store at")+" "+(fields[7].split("/"))[1]; 
+                else 
+                        _action = get_lang(fields[6]); 
+
+                return " <a href='javascript:void(0)' onclick=filter.form_r('"+pos+"','')><b>" + get_lang("Status") + " : </b>" + "<font color='red'>" + get_lang(fields[2]) + "</font>" + " - <b>" + get_lang("if email") + " </b>" + _criteria + " - <b>" + get_lang("Action") + ":</b> " + _action + "</a>"; 
+        } 
+}
         
         cfilterSh.prototype.vl_outOffice = function(outOffice){