Changeset 6224

Timestamp:

05/17/12 16:19:45 (12 years ago)

Author:

thiago

Message:

Ticket #2755 - Problemas na Janela de Filtros do Expresso Mail

Location:

trunk

Files:

• expressoMail1_2/index.php (modified) (2 diffs)
• prototype/modules/filters/filter-list.ejs (modified) (1 diff)
• prototype/modules/filters/init.ejs (modified) (1 diff)

trunk/expressoMail1_2/index.php

@@ -30 +30 @@
                 <link rel="stylesheet" type="text/css" href="../prototype/plugins/fullcalendar/fullcalendar.print.css"></link>
                 <link rel="stylesheet" type="text/css" href="../prototype/plugins/icalendar/jquery.icalendar.css"></link>
-        
+                
                 <script type="text/javascript" src="../prototype/plugins/jquery/jquery.min.js"></script>
-
+                <link href="../prototype/modules/filters/filters.css" rel="stylesheet" type="text/css">
                 <script type="text/javascript" src="../prototype/plugins/jquery/jquery-ui.min.js"></script>
                 <script src="../prototype/plugins/json2/json2.js" language="javascript"></script>
@@ -325 +325 @@
         <!--<link rel="stylesheet" type="text/css" href="../prototype/modules/calendar/css/style.css" /> -->
         <script type="text/javascript" src="../prototype/modules/filters/filters.js"></script>
+        
         ';
         

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

@@ -2 +2 @@
 <%
         data.rules = (data.rules || []);
+        
         for (var i=0; i<data.rules.length; i++) {
-
+        if(typeof data.rules[i].criteria == "undefined") continue;
+        
 %>
                 <% if(data.rules[i].id == "") continue %>

trunk/prototype/modules/filters/init.ejs

@@ -1 @@
-<link rel="stylesheet" href="../prototype/modules/filters/filters.css" type="text/css" />
-
 <div class="expresso-window-filters expresso-window-container filter-manager-window" title="<% get_lang("Filters")%>">
         <div class="expresso-window-container filter-manager-window rule-list-container" title="<% get_lang("List")%>"></div>