Added table alias for fields search

execut · Aug 2, 2018 · cb9999e · cb9999e
1 parent 25dfe3b
commit cb9999e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/fields/Field.php b/fields/Field.php
@@ -253,7 +253,7 @@ public function applyScopes(ActiveQuery $query) {
 
                 if (!empty($value) || $value === '0') {
                     $query->andFilterWhere([
-                        $attribute => $value,
+                        $this->model->tableName() . '.' . $attribute => $value,
                     ]);
                 }
             }

diff --git a/fields/HasOneRadioList.php b/fields/HasOneRadioList.php
@@ -25,6 +25,10 @@ class HasOneRadioList extends HasOneSelect2
     public $widgetOptions = [];
     public $fieldWidgetOptions = [];
     public function getField() {
+        if ($this->_field === false) {
+            return false;
+        }
+
         $data = $this->getRelationObject()->getData(true);
         unset($data['']);
         if (empty($data)) {