Changeset 7863 for branches/2.5/prototype

Timestamp:

02/06/13 13:40:46 (11 years ago)

Author:

douglas

Message:

Ticket #3337 - Problema ao utilizar a opção Buscar na Caixa de Entrada

Location:

branches/2.5/prototype

Files:

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

branches/2.5/prototype/modules/filters/filters.js

@@ -491 +491 @@
         var criterias_ = new Array();
 
+    var isExact = (list_container.find('[name="isExact"]:checked').val() == 'and') ? 'yes' : 'no'; 
+ 
         for (i in criteria_)
                 if(criteria_[i] != "")
@@ -514 +516 @@
                                                 });
 
-        var data = DataLayer.get( 'message', { filter: criterias_, criteria: { properties: { context: { folder: 'INBOX' } } } }, true );
+        var data = DataLayer.get( 'message', { filter: criterias_, criteria: { isExact: isExact , properties: { context: { folder: 'INBOX' } } } }, true );
         if(DataLayer.criterias['message:jqGrid']){
                 delete DataLayer.criterias['message:jqGrid'];   

branches/2.5/prototype/services/ImapServiceAdapter.php

@@ -174 +174 @@
                         {
                             if( count( $filter[$i] ) === 4 )
-                            $criteria['isExact'] = ( array_shift( $filter[$i] ) === 'AND' );
+                                array_shift( $filter[$i] ) ;
 
                             $criteria[ $filter[$i][0] ] = array( 'criteria' => $filter[$i][2], 'filter' => $filter[$i][1] );