Skip to content

Commit 1aaaf8a

Browse files
committed
Enh: Migration to BS5 and HumHub 1.18
1 parent 7427974 commit 1aaaf8a

57 files changed

Lines changed: 72 additions & 37 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Events.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
namespace humhub\modules\transition;
1010

11+
use humhub\helpers\ControllerHelper;
1112
use humhub\modules\admin\permissions\ManageUsers;
1213
use humhub\modules\admin\widgets\UserMenu;
1314
use humhub\modules\legal\Module;
@@ -44,7 +45,7 @@ public static function onAdminUserMenuInit($event)
4445
'label' => Yii::t('TransitionModule.config', 'Default spaces'),
4546
'url' => ['/transition/admin/default-spaces'],
4647
'sortOrder' => 2000,
47-
'isActive' => MenuLink::isActiveState('transition', 'admin', 'default-spaces'),
48+
'isActive' => ControllerHelper::isActivePath('transition', 'admin', 'default-spaces'),
4849
'isVisible' => true,
4950
]));
5051
}

Module.php

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@
88

99
namespace humhub\modules\transition;
1010

11-
use humhub\libs\DynamicConfig;
11+
use humhub\helpers\ThemeHelper;
1212
use humhub\modules\content\components\ContentContainerModule;
1313
use humhub\modules\content\components\ContentContainerModuleManager;
1414
use humhub\modules\transition\jobs\SyncAllSpaceHosts;
15-
use humhub\modules\ui\view\helpers\ThemeHelper;
1615
use humhub\modules\user\models\User;
1716
use Yii;
1817

@@ -25,11 +24,6 @@ class Module extends ContentContainerModule
2524
*/
2625
public $icon = 'eye';
2726

28-
/**
29-
* @var string defines path for resources, including the screenshots' path for the marketplace
30-
*/
31-
public $resourcesPath = 'resources';
32-
3327
/**
3428
* @var int Group ID for the "Space hosts" group (for spaces' administrators and moderators)
3529
*/
@@ -63,7 +57,7 @@ public function disable()
6357
*/
6458
public function enable()
6559
{
66-
if (parent::enable()) {
60+
if (parent::enable() !== false) {
6761
$this->enableTheme();
6862
ContentContainerModuleManager::setDefaultState(User::class, 'transition', 1);
6963
Yii::$app->queue->push(new SyncAllSpaceHosts());
@@ -87,7 +81,6 @@ private function enableTheme()
8781
$theme = ThemeHelper::getThemeByName(self::THEME_NAME);
8882
if ($theme !== null) {
8983
$theme->activate();
90-
DynamicConfig::rewrite();
9184
}
9285
}
9386

docs/CHANGELOG.md

Lines changed: 1 addition & 0 deletions

messages/de/config.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
return array (
3-
'Choose a space for each region. When a user registers a new account, depending on the region he choose, he will become a member to the corresponding space.' => 'Wählen Sie für jede Region ein Feld aus. Wenn ein Benutzer ein neues Konto registriert, wird er abhängig von der von ihm gewählten Region Mitglied des entsprechenden Bereichs.',
3+
'Choose a space for each region. When a user registers a new account, depending on the region he choose, he will become a member to the corresponding space.' => 'Wählen Sie für jede Region ein Feld aus. Wenn ein Benutzer ein neues Konto registriert, wird er abhängig von der von ihm gewählten Region Mitglied des entsprechenden Space.',
44
'Default space' => 'Standardraum',
55
'Default spaces' => 'Standard-Leerzeichen',
66
'Region' => 'Region',

module.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"keywords": [],
66
"version": "2.0",
77
"humhub": {
8-
"minVersion": "1.16"
8+
"minVersion": "1.18"
99
},
1010
"homepage": "https://cuzy.app",
1111
"authors": [

themes/Transition/less/variables.less

Lines changed: 0 additions & 1 deletion
This file was deleted.
5.61 KB
6.35 KB
1.46 KB
1.75 KB

0 commit comments

Comments
 (0)