Changeset 7719

Timestamp:

01/09/13 08:04:22 (11 years ago)

Author:

gustavo

Message:

Ticket #3275 - Erro apos utilizar o recurso Buscar na caixa de entrada

Location:

trunk/prototype

Files:

• modules/filters/filters.js (modified) (3 diffs)
• services/ImapServiceAdapter.php (modified) (1 diff)

trunk/prototype/modules/filters/filters.js

@@ -198 +198 @@
 
 date2Time = function (timestamp) {
-        var date = new Date();
-        if( typeof timestamp === "string" )
-            timestamp = parseInt( timestamp, 10 );
-        if ((date.getTime() - timestamp) < (24*60*60*1000)) {
-                return '<span class="timable" title="'+timestamp+'"> </span>';
-        } else {
-                date = new Date(timestamp);
-                var b = date.toISOString().split("T")[0].split("-");
-                var c = b[2] + "/" + b[1] + "/" + b[0];
-                return '<span class="datable">' + c + '</span>';
-        }
+    var date = new Date();
+    if( typeof timestamp === "string" )
+        timestamp = parseInt( timestamp, 10 );
+    if ((date.getTime() - timestamp) < (24*60*60*1000)) {
+        return '<span class="timable" title="'+timestamp+'"> </span>';
+    } else {
+        date = new Date(timestamp);
+        var b = date.toISOString().split("T")[0].split("-");
+        var c = b[2] + "/" + b[1] + "/" + b[0];
+        return '<span class="datable">' + c + '</span>';
+    }
 };
 
@@ -515 +515 @@
 
         var data = DataLayer.get( 'message', { filter: criterias_, criteria: { properties: { context: { folder: 'INBOX' } } } }, true );
+        if(DataLayer.criterias['message:jqGrid']){
+                delete DataLayer.criterias['message:jqGrid'];   
+        }
 
         DataLayer.register( 'criterias', 'message:jqGrid', function( crit ){
@@ -564 +567 @@
                 height:200,
                 loadComplete: function(data) {
-          //                            // aplica o contador
-          //                            jQuery('.timable').each(function (i) {
-          //                                    jQuery(this).countdown({
-          //                                            since: new Date(parseInt(this.title)),
-          //                                            significant: 1,
-          //                                            layout: 'h&aacute; {d<}{dn} {dl} {d>}{h<}{hn} {hl} {h>}{m<}{mn} {ml} {m>}{s<}{sn} {sl}{s>}',
-          //                                            description: ' atr&aacute;s'
-          //                                    });
-          //                            });
+                        // aplica o contador
+                        jQuery('.timable').each(function (i) {
+                                jQuery(this).countdown({
+                                        since: new Date(parseInt(this.title)),
+                                        significant: 1,
+                                        layout: 'h&aacute; {d<}{dn} {dl} {d>}{h<}{hn} {hl} {h>}{m<}{mn} {ml} {m>}{s<}{sn} {sl}{s>}',
+                                        description: ' atr&aacute;s'
+                                });
+                        });
                 },
                 onSelectRow: function (id, selected) {

trunk/prototype/services/ImapServiceAdapter.php

@@ -212 +212 @@
                                 //return var_export($result);
 
-                                $response = array( "page" => $page, "total" => $total_pages, "records" => $count );
+                                if($filter){
+                                        $total_pages = count($filter[2]) > 0 ? ceil( count($filter[2])/$limit ) : 0;
+                                        $response = array( "page" => $page, "total" => $total_pages, "records" =>  count($filter[2]) ); 
+                                }else{
+                                        $response = array( "page" => $page, "total" =>  $total_pages, "records" =>  $count );   
+                                }
 
                                 for ($i=0; $i<count($result); ++$i)