Changeset 57057

Timestamp:

29/06/08 14:23:40 (2 months ago)

Author:

ischommer

Message:

BUGFIX Using correct baseclass for query building in SearchContext?
BUGFIX Apply filters even when passed value is "0" (e.g. ?ParentID=0)

Files:

• modules/sapphire/branches/roa/search/SearchContext.php (modified) (4 diffs)

modules/sapphire/branches/roa/search/SearchContext.php

@@ -80 +80 @@
         protected function applyBaseTableFields() {
                 $classes = ClassInfo::dataClassesFor($this->modelClass);
-                $fields = array($this->modelClass.'.*');
+                $fields = array(ClassInfo::baseDataClass($this->modelClass).'.*');
                 if($this->modelClass != $classes[0]) $fields[] = $classes[0].'.*';
                 //$fields = array_keys($model->db());
@@ -108 +108 @@
                 }
                 $query->select = array_merge($query->select,$fields);
-                
+
                 $SQL_limit = Convert::raw2sql($limit);
                 $query->limit($SQL_limit);
@@ -115 +115 @@
                 $query->orderby($SQL_sort);
                 foreach($searchParams as $key => $value) {
-                        if ($value != '0') {
+                        //if ($value != '0') {
                                 $key = str_replace('__', '.', $key);
                                 $filter = $this->getFilter($key);
@@ -123 +123 @@
                                         $filter->apply($query);
                                 }
-                        }
+                        //}
                 }