Merge pull request #90 from asaf050/master

Fix URL pagination issue
Nayjest · Nov 23, 2015 · c0eb709 · c0eb709
2 parents 19ae11f + 621686c
commit c0eb709
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 6 deletions.
diff --git a/src/DbalDataProvider.php b/src/DbalDataProvider.php
@@ -158,6 +158,29 @@ public function orderBy($fieldName, $direction)
 
     public function filter($fieldName, $operator, $value)
     {
+         switch ($operator) {
+            case "eq":
+                $operator = '=';
+                break;
+            case "n_eq":
+                $operator = '<>';    
+                break;
+            case "gt":
+                $operator = '>';    
+                 break;
+            case "lt":
+                $operator = '<';    
+                break;
+            case "ls_e":
+                $operator = '<=';    
+                break;
+            case "gt_e":
+                $operator = '>=';    
+                break;
+            default:
+                $operator = 'like';
+                break;
+        }
         $this->src->andWhere("$fieldName $operator :$fieldName");
         $this->src->setParameter($fieldName, $value);
         return $this;

diff --git a/src/EloquentDataProvider.php b/src/EloquentDataProvider.php
@@ -120,6 +120,29 @@ public function orderBy($fieldName, $direction)
      */
     public function filter($fieldName, $operator, $value)
     {
+        switch ($operator) {
+            case "eq":
+                $operator = '=';
+                break;
+            case "n_eq":
+                $operator = '<>';    
+                break;
+            case "gt":
+                $operator = '>';    
+                 break;
+            case "lt":
+                $operator = '<';    
+                break;
+            case "ls_e":
+                $operator = '<=';    
+                break;
+            case "gt_e":
+                $operator = '>=';    
+                break;
+            default:
+                $operator = 'like';
+                break;
+        }
         $this->src->where($fieldName, $operator, $value);
         return $this;
     }

diff --git a/src/FilterConfig.php b/src/FilterConfig.php
@@ -4,12 +4,12 @@
 class FilterConfig
 {
     const OPERATOR_LIKE = 'like';
-    const OPERATOR_EQ = '=';
-    const OPERATOR_NOT_EQ = '<>';
-    const OPERATOR_GT = '>';
-    const OPERATOR_LS = '<';
-    const OPERATOR_LSE = '<=';
-    const OPERATOR_GTE = '>=';
+    const OPERATOR_EQ = 'eq';
+    const OPERATOR_NOT_EQ = 'n_eq';
+    const OPERATOR_GT = 'gt';
+    const OPERATOR_LS = 'lt';
+    const OPERATOR_LSE = 'ls_e';
+    const OPERATOR_GTE = 'gt_e';
 
 
     /** @var  FieldConfig */