Merge pull request #3 from GreenMeteor/dev

Enh: AdminMenu permission restriction

Author: ArchBlood

Assets.php

@@ -8,10 +8,6 @@
 class Assets extends AssetBundle
 {
 
-    public $publishOptions = [
-        'forceCopy' => true
-    ];
-
     public function init()
     {
         $this->sourcePath = dirname(__FILE__) . '/resources';

Events.php

@@ -5,22 +5,31 @@
 use Yii;
 use yii\helpers\Url;
 use yii\base\BaseObject;
-use humhub\models\Setting;
+use humhub\modules\ui\menu\MenuLink;
 use humhub\modules\ui\icon\widgets\Icon;
+use humhub\modules\admin\widgets\AdminMenu;
+use humhub\modules\admin\permissions\ManageModules;
 
 class Events extends BaseObject
 {
 
     public static function onAdminMenuInit($event)
     {
-        $event->sender->addItem([
+        if (!Yii::$app->user->can(ManageModules::class)) {
+            return;
+        }
+
+        /** @var AdminMenu $menu */
+        $menu = $event->sender;
+
+        $menu->addEntry(new MenuLink([
             'label' => Yii::t('CodeboxModule.base', 'Codebox Settings'),
             'url' => Url::toRoute('/codebox/admin/index'),
-            'group' => 'settings',
             'icon' => Icon::get('code'),
             'isActive' => Yii::$app->controller->module && Yii::$app->controller->module->id == 'codebox' && Yii::$app->controller->id == 'admin',
             'sortOrder' => 600,
-        ]);
+            'isVisible' => true,
+        ]));
     }
 
     public static function addCodeboxFrame($event)

Module.php

@@ -41,7 +41,7 @@ public function getOrder()
     {
         $sortOrder = $this->settings->get('sortOrder');
         if (empty($sortOrder)) {
-            return '';
+            return '100';
         }
         return $sortOrder;
     }

docs/CHANGELOG.md

@@ -1,4 +1,8 @@
 # Changelogs
+### Release v1.0.2 (*TBA*)
+- Enh: Implement AdminMenu permission restriction
+- Enh: minVersion update
+- Enh: Remove unused $publishOptions
 
 ### Release v1.0.1 (*11/28/2020*)
 - Enh: Make sortOrder Configurable

docs/CHANGELOGS.md

@@ -3,9 +3,9 @@
     "name": "Codebox",
     "description": "Allows the use of HTML snippets on your sidebar.",
     "keywords": ["codebox"],
-    "version": "1.0.1",
+    "version": "1.0.2",
     "humhub": {
-    "minVersion": "1.3"
+    "minVersion": "1.5"
     },
     "screenshots": ["resources/Screenshot_1.png", "resources/Screenshot_2.png"]
 }

module.json

@@ -1,5 +1,6 @@
 <?php
 
+use humhub\modules\ui\form\widgets\SortOrderField;
 use yii\bootstrap\ActiveForm;
 use yii\helpers\Html;
 
@@ -14,7 +15,7 @@
 <div class="form-group">
     <?= $form->field($model, 'title')->textInput(['class' => 'form-control', 'placeholder' => 'Title', 'disabled' => false])->label(true) ?>
     <?= $form->field($model, 'htmlCode')->textarea(['rows' => '8']); ?>
-    <?= $form->field($model, 'sortOrder')->textInput(['class' => 'form-control', 'placeholder' => 'Select a sort order...', 'disabled' => false])->label(true) ?>
+    <?= $form->field($model, 'sortOrder')->widget(SortOrderField::class) ?>
 </div>
 <hr>