Добавлено отображение сетевого имени (если есть) оборудования в списке оборудования...

[invent/invent.git] / models / ItemsSearch.php

diff --git a/models/ItemsSearch.php b/models/ItemsSearch.php
index 91a3a23..e84d74a 100644 (file)
--- a/models/ItemsSearch.php
+++ b/models/ItemsSearch.php
@@ -186,9 +186,11 @@ class ItemsSearch extends Items
             'id'   => $this->id,
         ])->andFilterWhere([
             'ilike', Status::tableName() .    '.name', $this->statusName
-        ])->andFilterWhere([
+        ])->andFilterWhere([ 'OR', [
             'ilike', Models::tableName() .    '.name', $this->modelName
-        ])->andFilterWhere([
+        ], [
+            'ilike', Items::tableName() .     '.name', $this->modelName
+        ]])->andFilterWhere([
             'ilike', Types::tableName() .     '.name', $this->typeName
         ])->andFilterWhere([ 'OR', [
             'ilike', Locations::tableName() . '.name', $this->regionName