dev

skeeks-cms · Aug 10, 2018 · 101d908 · 101d908
1 parent 4d2afe1
commit 101d908
Showing 1 changed file with 26 additions and 9 deletions.
diff --git a/src/controllers/AdminCmsContentElementController.php b/src/controllers/AdminCmsContentElementController.php
@@ -80,9 +80,10 @@ public function actions()
                 'on init'        => function ($e) {
                     $action = $e->sender;
                     /**
-                     * @var BackendGridModelAction $action
+                     * @var $action BackendGridModelAction
                      */
                     $action->url = ["/".$action->uniqueId, 'content_id' => $this->content->id];
+                    $this->initGridData($action, $this->content);
                 },
 
                 "filters" => [
@@ -467,16 +468,26 @@ public function actions()
         ]);
 
         //Дополнительные свойства
+        return $result;
+    }
+
+
+    public function initGridData($action, $content)
+    {
+        /**
+         * @var $action BackendGridModelAction
+         */
+
         $model = null;
         $autoFilters = [];
         $autoRules = [];
         $autoLabels = [];
 
         $autoColumns = [];
 
-        if ($this->content) {
+        if ($content) {
             $model = new CmsContentElement([
-                'content_id' => $this->content->id,
+                'content_id' => $content->id,
             ]);
         }
 
@@ -666,20 +677,26 @@ public function actions()
         }
 
         if ($autoColumns) {
-            $result['index']['grid']['columns'] = ArrayHelper::merge($result['index']['grid']['columns'], $autoColumns);
+            //$result['index']['grid']['columns'] = ArrayHelper::merge($result['index']['grid']['columns'], $autoColumns);
+            $action->grid['columns'] = ArrayHelper::merge($action->grid['columns'], $autoColumns);
         }
 
         if ($autoRules) {
-            $result['index']['filters']['filtersModel']['rules'] = ArrayHelper::merge((array)$result['index']['filters']['filtersModel']['rules'], $autoRules);
+            //$result['index']['filters']['filtersModel']['rules'] = ArrayHelper::merge((array)$result['index']['filters']['filtersModel']['rules'], $autoRules);
+            $action->filters['filtersModel']['rules'] = ArrayHelper::merge($action->filters['filtersModel']['rules'], $autoRules);
         }
 
         if ($autoFilters) {
-            $result['index']['filters']['filtersModel']['fields'] = ArrayHelper::merge((array)ArrayHelper::getValue($result, ['index', 'filters', 'filtersModel', 'fields']), $autoFilters);
-            $result['index']['filters']['filtersModel']['attributeDefines'] = ArrayHelper::merge((array)ArrayHelper::getValue($result, ['index', 'filters', 'filtersModel', 'attributeDefines']), array_keys($autoFilters));
-            $result['index']['filters']['filtersModel']['attributeLabels'] = ArrayHelper::merge((array)ArrayHelper::getValue($result, ['index', 'filters', 'filtersModel', 'attributeLabels']), $autoLabels);
+            //$result['index']['filters']['filtersModel']['fields'] = ArrayHelper::merge((array)ArrayHelper::getValue($result, ['index', 'filters', 'filtersModel', 'fields']), $autoFilters);
+            //$result['index']['filters']['filtersModel']['attributeDefines'] = ArrayHelper::merge((array)ArrayHelper::getValue($result, ['index', 'filters', 'filtersModel', 'attributeDefines']), array_keys($autoFilters));
+            //$result['index']['filters']['filtersModel']['attributeLabels'] = ArrayHelper::merge((array)ArrayHelper::getValue($result, ['index', 'filters', 'filtersModel', 'attributeLabels']), $autoLabels);
+
+            $action->filters['filtersModel']['fields'] = ArrayHelper::merge($action->filters['filtersModel']['fields'], $autoFilters);
+            $action->filters['filtersModel']['attributeDefines'] = ArrayHelper::merge($action->filters['filtersModel']['attributeDefines'], array_keys($autoFilters));
+            $action->filters['filtersModel']['attributeLabels'] = ArrayHelper::merge(ArrayHelper::getValue($action->filters, ['filtersModel', 'attributeLabels']), $autoLabels);
         }
 
-        return $result;
+        return $this;
     }
 
     public function contentEdit(Event $e)