Merge remote-tracking branch 'origin/master'

Anastasia
2 parents bc9815fa 3a45f80d
Showing 9 changed files with 62 additions and 7 deletions Show diff stats
backend/actions/Index.php
backend/controllers/BlogArticleController.php
backend/controllers/BlogCategoryController.php
backend/controllers/BlogTagController.php
backend/controllers/FeedbackController.php
backend/controllers/PageCategoryController.php
backend/controllers/PageController.php
backend/controllers/SlideController.php
backend/models/Search.php
+<?php
+    
+    namespace backend\actions;
+    
+    use artbox\core\admin\actions\Index as CoreInde;
+    use backend\models\Search;
+
+    class Index extends CoreInde
+    {
+        public function init()
+        {
+            $this->_query = call_user_func(
+                [
+                    $this->model,
+                    'find',
+                ]
+            );
+            
+            $this->_search = new Search(
+                [
+                    'model'        => $this->model,
+                    'hasLanguage'  => $this->hasLanguage,
+                    'controllerId' => $this->controller->id,
+                ]
+            );
+            
+            if ($this->hasLanguage) {
+                $this->_query->joinWith('language');
+            }
+            
+            $this->parseColumns();
+            
+            \artbox\core\admin\assets\Index::register($this->controller->view);
+        }
+    }
 \ No newline at end of file
@@ -10,7 +10,7 @@
     use artbox\core\admin\actions\Create;
     use artbox\core\admin\actions\Delete;
-    use artbox\core\admin\actions\Index;
+    use backend\actions\Index;
     use artbox\core\admin\actions\Update;
     use artbox\core\admin\actions\View;
     use artbox\core\admin\interfaces\ControllerInterface;
@@ -10,7 +10,7 @@
     use artbox\core\admin\actions\Create;
     use artbox\core\admin\actions\Delete;
-    use artbox\core\admin\actions\Index;
+    use backend\actions\Index;
     use artbox\core\admin\actions\Update;
     use artbox\core\admin\actions\View;
     use artbox\core\admin\interfaces\ControllerInterface;
@@ -10,7 +10,7 @@
     use artbox\core\admin\actions\Create;
     use artbox\core\admin\actions\Delete;
-    use artbox\core\admin\actions\Index;
+    use backend\actions\Index;
     use artbox\core\admin\actions\Update;
     use artbox\core\admin\actions\View;
     use artbox\core\admin\interfaces\ControllerInterface;
@@ -3,7 +3,7 @@
     namespace backend\controllers;
     use artbox\core\admin\actions\Delete;
-    use artbox\core\admin\actions\Index;
+    use backend\actions\Index;
     use artbox\core\admin\actions\View;
     use artbox\core\admin\interfaces\ControllerInterface;
     use artbox\core\admin\widgets\Form;
@@ -10,7 +10,7 @@
     use artbox\core\admin\actions\Create;
     use artbox\core\admin\actions\Delete;
-    use artbox\core\admin\actions\Index;
+    use backend\actions\Index;
     use artbox\core\admin\actions\Update;
     use artbox\core\admin\actions\View;
     use artbox\core\admin\interfaces\ControllerInterface;
@@ -5,7 +5,7 @@
     use function array_merge;
     use artbox\core\admin\actions\Create;
     use artbox\core\admin\actions\Delete;
-    use artbox\core\admin\actions\Index;
+    use backend\actions\Index;
     use artbox\core\admin\actions\Update;
     use artbox\core\admin\actions\View;
     use artbox\core\admin\interfaces\ControllerInterface;
@@ -10,7 +10,7 @@
     use artbox\core\admin\actions\Create;
     use artbox\core\admin\actions\Delete;
-    use artbox\core\admin\actions\Index;
+    use backend\actions\Index;
     use artbox\core\admin\actions\Update;
     use artbox\core\admin\interfaces\ControllerInterface;
     use artbox\core\admin\widgets\Form;
+<?php
+    
+    namespace backend\models;
+    
+    use artbox\core\admin\models\Search as CoreSearch;
+    
+    class Search extends CoreSearch
+    {
+        public function attributeLabels()
+        {
+            $model = \Yii::createObject($this->model);
+            
+            return call_user_func(
+                [
+                    $model,
+                    'attributeLabels',
+                ]
+            );
+        }
+    }
 \ No newline at end of file