From fa34890339e0423fb4359a871de2d6f4808e3bf5 Mon Sep 17 00:00:00 2001 From: Yuriy Bakhtin Date: Tue, 28 May 2024 11:04:56 +0200 Subject: [PATCH] Update module resources path --- Module.php | 21 +++------------------ docs/CHANGELOG.md | 4 ++++ module.json | 4 ++-- 3 files changed, 9 insertions(+), 20 deletions(-) diff --git a/Module.php b/Module.php index 82922c0..dcf8ea6 100644 --- a/Module.php +++ b/Module.php @@ -16,9 +16,6 @@ class Module extends ContentContainerModule { - - public $resourcesPath = 'resources'; - /** * @var string sort name as 'name', 'size', 'updated_at' * @see FileSystemItemRow::ORDER_MAPPING @@ -33,18 +30,6 @@ class Module extends ContentContainerModule public $defaultPostedFilesSort = FileSystemItemRow::ORDER_TYPE_UPDATED_AT; public $defaultPostedFilesOrder = 'ASC'; - /** - * @var string default order of file entries e.g.: 'file.updated_at ASC' or 'title ASC' - */ - public $defaultFolderOrder = 'title ASC'; - - const ORDER_NAME = 'name'; - const ORDER_UPDATED_AT = 'updated_at'; - const ORDER_SIZE = 'size'; - - const UPLOAD_BEHAVIOUR_INDEX = 0; - const UPLOAD_BEHAVIOUR_REPLACE = 1; - /** * @inheritdoc */ @@ -64,8 +49,8 @@ public function init() public function getContentContainerTypes() { return [ - Space::className(), - User::className() + Space::class, + User::class, ]; } @@ -156,7 +141,7 @@ public function getConfigUrl() /** * Determines ZIP Support is enabled or not * - * @return boolean is ZIP support enabled + * @return bool is ZIP support enabled */ public function isZipSupportEnabled(): bool { diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index c39050e..3618888 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,6 +1,10 @@ Changelog ========= +0.17.0 - Unreleased +------------------------- +- Fix #220: Update module resources path + 0.16.7 - Unreleased ------------------------- - Fix #216: Fix image space rending on wall entry diff --git a/module.json b/module.json index 196b5f9..1ab9301 100644 --- a/module.json +++ b/module.json @@ -9,9 +9,9 @@ "organisation", "sharing" ], - "version": "0.16.7", + "version": "0.17.0", "humhub": { - "minVersion": "1.14" + "minVersion": "1.17" }, "homepage": "https://github.com/humhub/cfiles", "authors": [