Fix init of ContentHighlightAsset (#7003)

* Fix init of `ContentHighlightAsset` * Fix build assets for `ContentHighlightAsset` * Fix assets building
humhub · May 16, 2024 · a405027 · a405027
1 parent 783b7a0
commit a405027
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 18 deletions.
diff --git a/protected/humhub/assets/AppAsset.php b/protected/humhub/assets/AppAsset.php
@@ -10,6 +10,7 @@
 
 use humhub\components\assets\WebStaticAssetBundle;
 use humhub\modules\content\assets\ContentAsset;
+use humhub\modules\content\assets\ContentHighlightAsset;
 use humhub\modules\file\assets\FileAsset;
 use yii\bootstrap\BootstrapAsset;
 use yii\bootstrap\BootstrapPluginAsset;
@@ -83,6 +84,7 @@ class AppAsset extends WebStaticAssetBundle
          */
         CoreApiAsset::class,
         ContentAsset::class,
+        ContentHighlightAsset::class,
         FileAsset::class,
     ];
 

diff --git a/protected/humhub/config/assets-prod.php b/protected/humhub/config/assets-prod.php
@@ -2,7 +2,7 @@
 /**
  * This file is generated by the "yii asset" command.
  * DO NOT MODIFY THIS FILE DIRECTLY.
- * @version 2024-03-19 14:36:13
+ * @version 2024-05-16 10:57:16
  */
 return [
     'app' => [
@@ -219,6 +219,14 @@
             'app',
         ],
     ],
+    'humhub\\modules\\content\\assets\\ContentHighlightAsset' => [
+        'sourcePath' => null,
+        'js' => [],
+        'css' => [],
+        'depends' => [
+            'app',
+        ],
+    ],
     'humhub\\modules\\file\\assets\\FileAsset' => [
         'sourcePath' => null,
         'js' => [],
@@ -253,6 +261,7 @@
             'humhub\\assets\\IntersectionObserverPolyfillAsset',
             'humhub\\assets\\CoreApiAsset',
             'humhub\\modules\\content\\assets\\ContentAsset',
+            'humhub\\modules\\content\\assets\\ContentHighlightAsset',
             'humhub\\modules\\file\\assets\\FileAsset',
             'defer',
         ],
@@ -523,4 +532,4 @@
             'defer',
         ],
     ],
-];
+];
diff --git a/protected/humhub/modules/content/Events.php b/protected/humhub/modules/content/Events.php
@@ -11,7 +11,6 @@
 use humhub\commands\CronController;
 use humhub\commands\IntegrityController;
 use humhub\components\Event;
-use humhub\modules\content\assets\ContentHighlightAsset;
 use humhub\modules\content\components\ContentActiveRecord;
 use humhub\modules\content\models\Content;
 use humhub\modules\content\services\ContentSearchService;
@@ -143,14 +142,6 @@ public static function onCronBeforeAction($event): void
         }
     }
 
-    public static function onViewBeginBody($event)
-    {
-        if (Yii::$app->isInstalled()) {
-            ContentHighlightAsset::register($event->sender);
-        }
-    }
-
-
     private static function canPublishScheduledContent(): bool
     {
         $lastPublishTime = self::getModule()->settings->get('lastPublishScheduledTS');

diff --git a/protected/humhub/modules/content/assets/ContentHighlightAsset.php b/protected/humhub/modules/content/assets/ContentHighlightAsset.php
@@ -9,6 +9,7 @@
 
 use humhub\components\assets\AssetBundle;
 use Yii;
+use yii\web\Application;
 
 class ContentHighlightAsset extends AssetBundle
 {
@@ -27,16 +28,16 @@ class ContentHighlightAsset extends AssetBundle
     /**
      * @inheritdoc
      */
-    public static function register($view)
+    public function init()
     {
-        if (!Yii::$app->request->isConsoleRequest) {
+        parent::init();
+
+        if (Yii::$app instanceof Application && Yii::$app->isInstalled()) {
             $highlight = Yii::$app->session->get('contentHighlight');
             if ($highlight !== null && $highlight !== '') {
                 Yii::$app->session->remove('contentHighlight');
-                $view->registerJsConfig('content.highlight', ['keyword' => $highlight]);
+                Yii::$app->view->registerJsConfig('content.highlight', ['keyword' => $highlight]);
             }
         }
-
-        return parent::register($view);
     }
 }
diff --git a/protected/humhub/modules/content/config.php b/protected/humhub/modules/content/config.php
@@ -8,7 +8,6 @@
 use humhub\modules\user\models\User;
 use humhub\modules\space\models\Space;
 use humhub\modules\content\components\ContentActiveRecord;
-use yii\web\View;
 
 return [
     'id' => 'content',
@@ -23,7 +22,6 @@
         ['class' => ContentActiveRecord::class, 'event' => ContentActiveRecord::EVENT_AFTER_DELETE, 'callback' => [Events::class, 'onContentActiveRecordDelete']],
         ['class' => CronController::class, 'event' => CronController::EVENT_ON_DAILY_RUN, 'callback' => [Events::class, 'onCronDailyRun']],
         ['class' => CronController::class, 'event' => CronController::EVENT_BEFORE_ACTION, 'callback' => [Events::class, 'onCronBeforeAction']],
-        ['class' => View::class, 'event' => View::EVENT_BEGIN_BODY, 'callback' => [Events::class, 'onViewBeginBody']],
     ],
     'consoleControllerMap' => [
         'content-search' => '\humhub\modules\content\commands\SearchController',