Merge pull request #2504 from thiagotalma/master

Allow add a condition telling the table to avoid ambiguity error.

Merge pull request #2504 from thiagotalma/master
73a15c2b · Qiang Xue · ba2c35b8 · ba9f5d65 · 73a15c2b
Commit 73a15c2b authored Feb 23, 2014 by Qiang Xue
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

search.php extensions/gii/generators/crud/templates/search.php +7 -1

No files found.
--- a/extensions/gii/generators/crud/templates/search.php
+++ b/extensions/gii/generators/crud/templates/search.php
@@ -72,7 +72,13 @@ class <?= $searchModelClass ?> extends Model

 	protected function addCondition($query, $attribute, $partialMatch = false)
 	{
-		$value = $this->$attribute;
+		if (($pos = strrpos($attribute, '.')) !== false) {
+			$modelAttribute = substr($attribute, $pos + 1);
+		} else {
+			$modelAttribute = $attribute;
+		}
+
+		$value = $this->$modelAttribute;
 		if (trim($value) === '') {
 			return;
 		}