Merge pull request #4 from dmstr/feature/refactor-2021-04-14

added backend overview, moved access control to module
dmstr · Apr 19, 2021 · 97502e6 · 97502e6
2 parents 2218de9 + 2c6e435
commit 97502e6
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 23 deletions.
diff --git a/src/Module.php b/src/Module.php
@@ -2,17 +2,28 @@
 
 namespace dmstr\modules\contact;
 
+use dmstr\web\traits\AccessBehaviorTrait;
+
 /**
  * @property string $defaultRoute
  * @property string $frontendLayout
  * @property string $backendLayout
  */
 class Module extends \yii\base\Module
 {
+    use AccessBehaviorTrait;
+
     /**
      * @inheritdoc
      */
-    public $defaultRoute = 'crud/contact-log';
+    public $defaultRoute = 'backend';
     public $frontendLayout = '//main';
     public $backendLayout = '@backend/views/layouts/box';
+
+    public function beforeAction($action)
+    {
+        \Yii::$app->controller->view->params['breadcrumbs'][] = ['label' => 'Contact', 'url' => ['/'.$this->id]];
+
+        return parent::beforeAction($action);
+    }
 }
diff --git a/src/controllers/BackendController.php b/src/controllers/BackendController.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace dmstr\modules\contact\controllers;
+
+class BackendController extends \yii\web\Controller
+{
+    public function init()
+    {
+        parent::init();
+        $this->layout = $this->module->backendLayout;
+    }
+
+    public function actionIndex()
+    {
+        return $this->render('index');
+    }
+
+}
diff --git a/src/controllers/ExportController.php b/src/controllers/ExportController.php
@@ -20,21 +20,6 @@ class ExportController extends Controller
 
     protected $schemaSettings = [];
 
-    public function behaviors()
-    {
-        $behaviors = parent::behaviors();
-        $behaviors['access'] = [
-            'class' => AccessControl::class,
-            'rules' => [
-                [
-                    'allow' => true,
-                    'roles' => ['Editor']
-                ]
-            ]
-        ];
-        return $behaviors;
-    }
-
     public function init()
     {
         parent::init();

diff --git a/src/controllers/crud/ContactLogController.php b/src/controllers/crud/ContactLogController.php
@@ -8,14 +8,13 @@
 
 namespace dmstr\modules\contact\controllers\crud;
 
-use dmstr\web\traits\AccessBehaviorTrait;
 
 /**
  * This is the class for controller "ContactLogController".
  */
 class ContactLogController extends \dmstr\modules\contact\controllers\crud\base\ContactLogController
 {
-    use AccessBehaviorTrait;
+
 
     public function init()
     {

diff --git a/src/controllers/crud/ContactTemplateController.php b/src/controllers/crud/ContactTemplateController.php
@@ -8,14 +8,13 @@
 
 namespace dmstr\modules\contact\controllers\crud;
 
-use dmstr\web\traits\AccessBehaviorTrait;
 
 /**
  * This is the class for controller "ContactTemplateController".
  */
 class ContactTemplateController extends \dmstr\modules\contact\controllers\crud\base\ContactTemplateController
 {
-    use AccessBehaviorTrait;
+
 
     public function init()
     {

diff --git a/src/views/backend/index.php b/src/views/backend/index.php
@@ -0,0 +1,20 @@
+<?php
+/* @var $this yii\web\View */
+
+use yii\helpers\Html;
+use Yii;
+
+?>
+<h1><?= Yii::t('contact', 'Overview') ?></h1>
+
+<p>
+    <?= Html::a(Yii::t('contact', 'Templates'), ['crud/contact-template']) ?>
+</p>
+
+<p>
+    <?= Html::a(Yii::t('contact', 'Logs'), ['crud/contact-log']) ?>
+</p>
+
+<p>
+    <?= Html::a(Yii::t('contact', 'Export'), ['export/index']) ?>
+</p>
diff --git a/src/views/crud/contact-log/index.php b/src/views/crud/contact-log/index.php
@@ -64,7 +64,7 @@
 			'encodeLabels' => false,
 			'items' => [
 				[
-					'url' => ['/crud/contact-template/index'],
+					'url' => ['/'.$this->context->module->id.'/crud/contact-template/index'],
 					'label' => '<i class="glyphicon glyphicon-arrow-left"></i> ' . Yii::t('models', 'Contact Template'),
 				],
 

diff --git a/src/views/crud/contact-log/view.php b/src/views/crud/contact-log/view.php
@@ -84,8 +84,8 @@
 				'format' => 'html',
 				'attribute' => 'contact_template_id',
 				'value' => ($model->contactTemplate ?
-					Html::a('<i class="glyphicon glyphicon-list"></i>', ['/crud/contact-template/index']).' '.
-					Html::a('<i class="glyphicon glyphicon-circle-arrow-right"></i> '.$model->contactTemplate->name, ['/crud/contact-template/view', 'id' => $model->contactTemplate->id, ]).' '.
+					Html::a('<i class="glyphicon glyphicon-list"></i>', ['/'.$this->context->module->id.'/crud/contact-template/index']).' '.
+					Html::a('<i class="glyphicon glyphicon-circle-arrow-right"></i> '.$model->contactTemplate->name, ['/'.$this->context->module->id.'/crud/contact-template/view', 'id' => $model->contactTemplate->id, ]).' '.
 					Html::a('<i class="glyphicon glyphicon-paperclip"></i>', ['create', 'ContactLog'=>['contact_template_id' => $model->contact_template_id]])
 					:
 					'<span class="label label-warning">?</span>'),