fixes

Author: ZAYEC77

src/actions/PageView.php

@@ -5,6 +5,7 @@
 use nullref\cms\models\Page;
 use Yii;
 use yii\base\Action;
+use yii\caching\TagDependency;
 use yii\web\NotFoundHttpException;
 
 
@@ -15,15 +16,15 @@
 class PageView extends Action
 {
     public $view = 'view';
-    
+
     public function run()
     {
         if (($route = Yii::$app->request->getQueryParam('route')) == null) {
             throw new NotFoundHttpException(Yii::t('cms', 'Page not found.'));
         }
         $page = Page::getDb()->cache(function () use ($route) {
             return Page::find()->byRoute($route)->one();
-        });
+        }, null, new TagDependency(['tags' => 'cms.page.' . $route]));
 
         if (!isset($page)) {
             throw new NotFoundHttpException(Yii::t('cms', 'Page not found.'));
@@ -39,6 +40,8 @@ public function run()
             'page' => $page,
         ]);
 
+        //@TODO add tag dependency by blocks
+
         return $result;
     }
 }

src/controllers/admin/PageController.php

@@ -5,6 +5,7 @@
 use nullref\cms\models\Page;
 use nullref\core\interfaces\IAdminController;
 use Yii;
+use yii\caching\TagDependency;
 use yii\data\ActiveDataProvider;
 use yii\filters\VerbFilter;
 use yii\web\Controller;
@@ -101,7 +102,8 @@ public function actionUpdate($id)
 
         $default = Yii::$app->request->isPost ? ['PageHasBlock' => []] : [];
         if ($model->loadWithRelations(array_merge($default, Yii::$app->request->post())) && $model->save()) {
-            Yii::$app->cache->delete('cms.page.' . $model->route);
+            TagDependency::invalidate(Yii::$app->cache, 'cms.page.' . $model->route);
+            TagDependency::invalidate(Yii::$app->cache, 'cms.page.' . $model->oldAttributes['route']);
             return $this->redirect(['view', 'id' => $model->id]);
         } else {
             return $this->render('update', [

src/views/admin/page/_form.php

@@ -1,6 +1,7 @@
 <?php
 
 use mihaildev\ckeditor\CKEditor;
+use mihaildev\elfinder\ElFinder;
 use nullref\cms\assets\PageFormAssets;
 use nullref\cms\models\Page;
 use unclead\widgets\MultipleInput;
@@ -55,9 +56,9 @@ class="btn btn-danger btn-xs"
             <div class="row" data-type="<?= Page::TYPE_CONTENT ?>" style="display: none">
                 <div class="col-md-12">
                     <?= $form->field($model, 'content')->widget(CKEditor::className(), [
-                        'editorOptions' => [
+                        'editorOptions' => ElFinder::ckeditorOptions('elfinder-backend', [
                             'height' => 300,
-                        ]
+                        ]),
                     ]) ?>
                 </div>
             </div>