Changeset 6545 for sandbox/expressoServiceImap/prototype/modules

Timestamp:

06/19/12 23:40:56 (12 years ago)

Author:

natan

Message:

Ticket #2845 - Atualizacao da API na busca de mensagens - Correcao do problema nas paginacoes

Location:

sandbox/expressoServiceImap/prototype/modules

Files:

• attach_message/attach_message.js (modified) (1 diff)
• attach_message/common.js (modified) (3 diffs)
• filters/filters.js (modified) (2 diffs)

sandbox/expressoServiceImap/prototype/modules/attach_message/attach_message.js

@@ -43 +43 @@
     
     current_folder = targetId.replace(dashes, '.');
-    current_count = DataLayer.get( 'message', { criteria: { count: true } }, true );
+    current_count = DataLayer.get( 'message', { criteria: { count: true, properties: {context:{folder:current_folder}} } }, true );
 
      $("#message_attacher_grid").trigger("reloadGrid")

sandbox/expressoServiceImap/prototype/modules/attach_message/common.js

@@ -4 +4 @@
 months = ['Jan','Feb','Mar','Apr','May','June','July','Aug','Sept','Oct','Nov','Dec'];
 current_folder = 'INBOX';
+current_count = DataLayer.get( 'message', { criteria: { count: true, properties: {context:{folder:current_folder}} } }, true );
 
 DataLayer.codec( 'folder', 'tree', {
@@ -56 +57 @@
 
       encoder: function( data, crit ){
-
-            if( !crit.criteria.properties.context.folder.indexOf( 'local_messages/' ) )
+        
+            crit = crit.criteria;
+
+            if( !crit.properties.context.folder.indexOf( 'local_messages/' ) )
             {
-                var msgs = expresso_local_messages.get_local_range_msgs( crit.criteria.properties.context.folder.replace(dots, "/").replace("local_messages/", ""),
+                var msgs = expresso_local_messages.get_local_range_msgs( crit.properties.context.folder.replace(dots, "/").replace("local_messages/", ""),
                                                                           crit.offset + 1, crit.limit, "SORTARRIVAL", crit.orderDesc, "ALL", 1, 1 );
 
@@ -75 +78 @@
                 }
 
-                return( {"rows": msgs, 
-                          "records": msgs.length,
-                          "page": crit.page, 
-                          "total": Math.ceil( msgs.num_msgs / crit.limit )} );
+                data = msgs;
             }
 
-            return( data );
+            return( {"rows": data, 
+                      "records": data.num_msgs || current_count,
+                      "page": crit.offset / crit.limit + 1, 
+                      "total": Math.ceil( data.num_msgs || current_count / crit.limit )} );
       },
       criteria: function( crit ){
 
-            return { criteria: { properties: {context:{folder: current_folder || 'INBOX'}}, offset: crit.rows * ( crit.page - 1 ), limit: crit.rows, orderDesc: crit.sord == "desc" } };
+            return { criteria: { properties: {context:{folder: current_folder || 'INBOX'}}, offset: crit.rows * ( crit.page - 1 ), limit: crit.rows, orderDesc: crit.sord == "desc", currentCount: current_count } };
 
       }

sandbox/expressoServiceImap/prototype/modules/filters/filters.js

@@ -397 +397 @@
         var total = data.length ? Math.ceil( data.length / numRows ) : 0;
 
-        delete DataLayer.criterias['message:inboxSearch'];
-        delete DataLayer.encoders['message:inboxSearch'];
+//      delete DataLayer.criterias['message:inboxSearch'];
+//      delete DataLayer.encoders['message:inboxSearch'];
 
         DataLayer.codec( 'message', 'inboxSearch', {
@@ -427 +427 @@
                           return( false );
 
-                      return { filter: [ "msgNumber", "IN", msgNumber ], criteria: { properties: { context: { folder: 'INBOX', page: crit.page }, order: crit.sidx } } };
+                      return { filter: [ "IN", "msgNumber", msgNumber ], criteria: { properties: { context: { folder: 'INBOX', page: crit.page }, order: crit.sidx } } };
 
                   }
-          });
+          }, true );
 
         allMessages = data;