From b5b1c9f1bca189b9332e18650aae69e6b61ba792 Mon Sep 17 00:00:00 2001 From: Yuriy Bakhtin Date: Mon, 23 Feb 2026 14:31:00 +0300 Subject: [PATCH 01/19] Update for HumHub 1.19 --- Events.php | 30 +++++++++++++++++++----------- docs/CHANGELOG.md | 4 ++++ models/FileSystemItem.php | 4 +--- module.json | 4 ++-- widgets/views/fileListMenu.php | 7 ++++--- widgets/views/fileSystemItem.php | 5 +++-- 6 files changed, 33 insertions(+), 21 deletions(-) diff --git a/Events.php b/Events.php index eb23085a..a2e26b2d 100644 --- a/Events.php +++ b/Events.php @@ -2,6 +2,8 @@ namespace humhub\modules\cfiles; +use humhub\commands\IntegrityController; +use humhub\helpers\ControllerHelper; use humhub\modules\cfiles\extensions\custom_pages\elements\FileElement; use humhub\modules\cfiles\extensions\custom_pages\elements\FilesElement; use humhub\modules\cfiles\extensions\custom_pages\elements\FolderElement; @@ -14,7 +16,10 @@ use humhub\modules\file\actions\DownloadAction; use humhub\modules\file\models\File as BaseFile; use humhub\modules\space\models\Space; +use humhub\modules\space\widgets\Menu; +use humhub\modules\ui\menu\MenuLink; use humhub\modules\user\models\User; +use humhub\modules\user\widgets\ProfileMenu; use Yii; use yii\base\Event; @@ -27,15 +32,16 @@ class Events { public static function onSpaceMenuInit($event) { + /* @var Menu $menu */ + $menu = $event->sender; - if ($event->sender->space !== null && $event->sender->space->moduleManager->isEnabled('cfiles')) { - $event->sender->addItem([ + if ($menu->space !== null && $menu->space->moduleManager->isEnabled('cfiles')) { + $menu->addEntry(new MenuLink([ 'label' => Yii::t('CfilesModule.base', 'Files'), - 'group' => 'modules', 'url' => $event->sender->space->createUrl('/cfiles/browse'), - 'icon' => '', - 'isActive' => (Yii::$app->controller->module && Yii::$app->controller->module->id == 'cfiles'), - ]); + 'icon' => 'files-o', + 'isActive' => ControllerHelper::isActivePath('cfiles'), + ])); } } @@ -46,6 +52,7 @@ public static function onSpaceMenuInit($event) */ public static function onIntegrityCheck($event) { + /* @var IntegrityController $integrityController */ $integrityController = $event->sender; $integrityController->showTestHeadline("CFile Module (" . File::find()->count() . " entries)"); @@ -76,13 +83,14 @@ public static function onIntegrityCheck($event) public static function onProfileMenuInit($event) { - if ($event->sender->user !== null && $event->sender->user->moduleManager->isEnabled('cfiles')) { - $event->sender->addItem([ + /* @var ProfileMenu $menu */ + if ($menu->user !== null && $menu->user->moduleManager->isEnabled('cfiles')) { + $menu->addEntry(new MenuLink([ 'label' => Yii::t('CfilesModule.base', 'Files'), 'url' => $event->sender->user->createUrl('/cfiles/browse'), - 'icon' => '', - 'isActive' => (Yii::$app->controller->module && Yii::$app->controller->module->id == 'cfiles'), - ]); + 'icon' => 'files-o', + 'isActive' => ControllerHelper::isActivePath('cfiles'), + ])); } } diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 813fa1d5..c940e8f5 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,6 +1,10 @@ Changelog ========= +0.18.0 - Unreleased +--------------------------- +- Enh #272: Update for HumHub 1.19 + 0.17.2 - November 24, 2025 --------------------------- - Enh #264: Update download and upload actions diff --git a/models/FileSystemItem.php b/models/FileSystemItem.php index 98f19188..3bdb88ce 100644 --- a/models/FileSystemItem.php +++ b/models/FileSystemItem.php @@ -8,8 +8,6 @@ use humhub\modules\content\components\ContentContainerActiveRecord; use humhub\modules\content\components\ContentActiveRecord; use humhub\modules\content\models\Content; -use humhub\modules\user\models\User; -use humhub\modules\search\interfaces\Searchable; use Yii; /** @@ -21,7 +19,7 @@ * * @property-read Folder|null $parentFolder */ -abstract class FileSystemItem extends ContentActiveRecord implements ItemInterface, Searchable +abstract class FileSystemItem extends ContentActiveRecord implements ItemInterface { /** * @var int used for edit form diff --git a/module.json b/module.json index d8056bb6..97bf30e1 100644 --- a/module.json +++ b/module.json @@ -9,9 +9,9 @@ "organisation", "sharing" ], - "version": "0.17.2", + "version": "0.18.0", "humhub": { - "minVersion": "1.18" + "minVersion": "1.19" }, "homepage": "https://github.com/humhub/cfiles", "authors": [ diff --git a/widgets/views/fileListMenu.php b/widgets/views/fileListMenu.php index 433f095f..038fa2d4 100644 --- a/widgets/views/fileListMenu.php +++ b/widgets/views/fileListMenu.php @@ -8,6 +8,7 @@ use humhub\modules\file\widgets\UploadButton; use humhub\modules\file\widgets\UploadInput; use humhub\widgets\bootstrap\Button; +use humhub\widgets\bootstrap\Link; use humhub\widgets\modal\ModalButton; /* @var $folder Folder */ @@ -31,8 +32,8 @@ 'contentContainer' => $contentContainer, ]);?> - parentFolder) : ?> - parentFolder->getUrl())->left()->setText(''); ?> + parentFolder) : ?> + parentFolder->getUrl(), '')->left() ?> @@ -51,7 +52,7 @@