added 'startswith', 'endswith' and 'contains' (='like') as condition options

Author: lecterror

models/behaviors/filtered.php

@@ -194,18 +194,36 @@ function beforeFind(&$Model, $query)
 						continue;
 					}
 
-					if ($options['condition'] == 'like')
+					switch ($options['condition'])
 					{
-						$query['conditions'][$realFilterField.' like'] = '%'.$values[$fieldModelName][$fieldName].'%';
-					}
-					else if ($options['condition'] == '=')
-					{
-						$query['conditions'][$realFilterField] = $values[$fieldModelName][$fieldName];
-					}
-					else
-					{
-						$query['conditions'][$realFilterField.' '.$options['condition']] = $values[$fieldModelName][$fieldName];
+						case 'like':
+						case 'contains':
+							{
+								$query['conditions'][$realFilterField.' like'] = '%'.$values[$fieldModelName][$fieldName].'%';
+							}
+							break;
+						case 'startswith':
+							{
+								$query['conditions'][$realFilterField.' like'] = $values[$fieldModelName][$fieldName].'%';
+							}
+							break;
+						case 'endswith':
+							{
+								$query['conditions'][$realFilterField.' like'] = '%'.$values[$fieldModelName][$fieldName];
+							}
+							break;
+						case '=':
+							{
+								$query['conditions'][$realFilterField] = $values[$fieldModelName][$fieldName];
+							}
+							break;
+						default:
+							{
+								$query['conditions'][$realFilterField.' '.$options['condition']] = $values[$fieldModelName][$fieldName];
+							}
+							break;
 					}
+
 					break;
 				case 'select':
 					if (strlen(trim(strval($values[$fieldModelName][$fieldName]))) == 0)

tests/cases/mock_objects.php

@@ -94,4 +94,10 @@ class DocumentTestsController extends Controller
 	function index()
 	{
 	}
+
+	// must override this or the tests never complete..
+	// @TODO: mock partial?
+	function redirect()
+	{
+	}
 }