tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1032 from halkyon/datalist_filter_docs

Browse Source 
Improve class naming and docs for DataList::applyFilterContext()
This commit is contained in:
Sean Harvey 2013-01-06 17:23:43 -08:00
commit baaa270ceb
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
model/DataList.php
View File

@ -386,7 +386,7 @@ class DataList extends ViewableData implements SS_List, SS_Filterable, SS_Sortab
$fieldArgs = explode(':',$field); $fieldArgs = explode(':',$field);
$field = array_shift($fieldArgs); $field = array_shift($fieldArgs);
foreach($fieldArgs as $fieldArg){ foreach($fieldArgs as $fieldArg){
$comparisor = $this->applyFilterContext($field, $fieldArg, $value); $this->applyFilterContext($field, $fieldArg, $value);
} }
} else { } else {
if($field == 'ID') { if($field == 'ID') {
@ -455,23 +455,23 @@ class DataList extends ViewableData implements SS_List, SS_Filterable, SS_Sortab
} }
/** /**
* Translates the comparisator to the sql query * Translates a filter type to a SQL query.
* *
* @param string $field - the fieldname in the db * @param string $field - the fieldname in the db
* @param string $comparisators - example StartsWith, relates to a filtercontext * @param string $filter - a {@link SearchFilter} class, e.g. PartialMatch or StartsWith
* @param string $value - the value that the filtercontext will use for matching * @param string $value - the value that the filtercontext will use for matching
* @todo Deprecated SearchContexts and pull their functionality into the core of the ORM * @todo Deprecated SearchContexts and pull their functionality into the core of the ORM
*/ */
private function applyFilterContext($field, $comparisators, $value) { private function applyFilterContext($field, $filter, $value) {
$t = singleton($this->dataClass())->dbObject($field); $t = singleton($this->dataClass())->dbObject($field);
$className = "{$comparisators}Filter"; $className = sprintf('%sFilter', $filter);
if(!class_exists($className)){ if(!class_exists($className)) {
throw new InvalidArgumentException('There are no '.$comparisators.' comparisator'); throw new InvalidArgumentException(sprintf('Filter class "%s" does not exist', $className));
} }
$t = new $className($field,$value); $t = new $className($field, $value);
$t->apply($this->dataQuery()); $t->apply($this->dataQuery());
} }
/** /**
* Return a copy of this list which does not contain any items with these charactaristics * Return a copy of this list which does not contain any items with these charactaristics
* *