[Fmsystem-commits] [14764] filter on status

[Sigurd Nes]

Revision: 14764
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14764
Author:   sigurdne
Date:     2016-02-22 09:13:07 +0000 (Mon, 22 Feb 2016)
Log Message:
-----------
filter on status

Modified Paths:
--------------
    trunk/property/inc/class.sodocument.inc.php

Modified: trunk/property/inc/class.sodocument.inc.php
===================================================================
--- trunk/property/inc/class.sodocument.inc.php 2016-02-22 09:04:58 UTC (rev 
14763)
+++ trunk/property/inc/class.sodocument.inc.php 2016-02-22 09:13:07 UTC (rev 
14764)
@@ -123,7 +123,7 @@
                        {
                                $start = isset($data['start']) && 
$data['start'] ? $data['start'] : 0;
                                $results = isset($data['results']) && 
$data['results'] ? $data['results'] : 0;
-                               $filter = isset($data['filter']) ? 
$data['filter'] : '';
+                               $status_id = isset($data['status_id']) && 
$data['status_id'] ? $data['status_id'] : '';
                                $query = isset($data['query']) ? $data['query'] 
: '';
                                $sort = isset($data['sort']) && $data['sort'] ? 
$data['sort'] : 'DESC';
                                $order = isset($data['order']) ? $data['order'] 
: '';
@@ -264,9 +264,10 @@
                                $where = 'AND';
                        }
 
-                       if ($filter != 'all' && $filter)
+                       if ($status_id)
                        {
-                               $filtermethod .= " $where 
fm_document.user_id='$filter' ";
+                               $filtermethod .= "  $where 
fm_document.status='$status_id' ";
+                               $where = 'AND';
                        }
 
                        $querymethod = '';
@@ -1046,4 +1047,4 @@
                        }
                        return $file_list;
                }
-       }
\ No newline at end of file
+       }