Added log activity

wdmg · Jun 5, 2020 · 1db265a · 1db265a
1 parent 13a472f
commit 1db265a
Show file tree

Hide file tree

Showing 6 changed files with 94 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,8 @@
 Changelog
 =========
 
-## 1.*
+## 1.0.11 (2020-06-06)
+ * Added log activity
  * Fixed check for redirection (only frontend)
  * Update check() method of component
 

diff --git a/Module.php b/Module.php
@@ -6,7 +6,7 @@
  * Yii2 Redirects
  *
  * @category        Module
- * @version         1.0.10
+ * @version         1.0.11
  * @author          Alexsander Vyshnyvetskyy <[email protected]>
  * @link            https://github.com/wdmg/yii2-redirects
  * @copyright       Copyright (c) 2019 - 2020 W.D.M.Group, Ukraine
@@ -57,7 +57,7 @@ class Module extends BaseModule
     /**
      * @var string the module version
      */
-    private $version = "1.0.10";
+    private $version = "1.0.11";
 
     /**
      * @var integer, priority of initialization

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-[![Yii2](https://img.shields.io/badge/required-Yii2_v2.0.33-blue.svg)](https://packagist.org/packages/yiisoft/yii2)
+[![Yii2](https://img.shields.io/badge/required-Yii2_v2.0.35-blue.svg)](https://packagist.org/packages/yiisoft/yii2)
 [![Downloads](https://img.shields.io/packagist/dt/wdmg/yii2-redirects.svg)](https://packagist.org/packages/wdmg/yii2-redirects)
 [![Packagist Version](https://img.shields.io/packagist/v/wdmg/yii2-redirects.svg)](https://packagist.org/packages/wdmg/yii2-redirects)
 ![Progress](https://img.shields.io/badge/progress-ready_to_use-green.svg)
@@ -9,7 +9,7 @@ Redirects module for Yii2
 
 # Requirements
 * PHP 5.6 or higher
-* Yii2 v.2.0.33 and newest
+* Yii2 v.2.0.35 and newest
 * [Yii2 Base](https://github.com/wdmg/yii2-base) module (required)
 * [Yii2 SelectInput](https://github.com/wdmg/yii2-selectinput) widget
 
@@ -70,6 +70,7 @@ Use the `Module::dashboardNavItems()` method of the module to generate a navigat
     ?>
 
 # Status and version [ready to use]
+* v.1.0.11 - Added log activity, fixed check for redirection
 * v.1.0.10 - Update dependencies, fixed migrations
 * v.1.0.9 - Added pagination, up to date dependencies
 * v.1.0.8 - Migrations bugfix

diff --git a/components/Redirects.php b/components/Redirects.php
@@ -7,7 +7,7 @@
  * Yii2 Redirects
  *
  * @category        Component
- * @version         1.0.9
+ * @version         1.0.11
  * @author          Alexsander Vyshnyvetskyy <[email protected]>
  * @link            https://github.com/wdmg/yii2-redirects
  * @copyright       Copyright (c) 2019 - 2020 W.D.M.Group, Ukraine

diff --git a/composer.json b/composer.json
@@ -4,7 +4,7 @@
   "keywords": ["yii2", "yii2-redirects", "redirects", "redirect", "wdmg"],
   "type": "yii2-extension",
   "license": "MIT",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "homepage": "https://github.com/wdmg/yii2-redirects",
   "support": {
     "source": "https://github.com/wdmg/yii2-redirects",
@@ -21,8 +21,8 @@
     }
   ],
   "require": {
-    "yiisoft/yii2": "^2.0.33",
-    "wdmg/yii2-base": "^1.2.0",
+    "yiisoft/yii2": "^2.0.35",
+    "wdmg/yii2-base": "^1.2.3",
     "wdmg/yii2-selectinput": "^1.0.9"
   },
   "minimum-stability": "dev",

diff --git a/controllers/RedirectsController.php b/controllers/RedirectsController.php
@@ -158,6 +158,14 @@ public function actionCreate()
                 $model = new RedirectsImport();
                 if (count($data) > 0) {
                     if ($model->import($data)) {
+                        // Log activity
+                        $this->module->logActivity(
+                            'List of redirects has been successfully added.',
+                            $this->uniqueId . ":" . $this->action->id,
+                            'success',
+                            1
+                        );
+
                         Yii::$app->getSession()->setFlash(
                             'success',
                             Yii::t(
@@ -167,6 +175,14 @@ public function actionCreate()
                         );
                     }
                 } else {
+                    // Log activity
+                    $this->module->logActivity(
+                        'An error occurred while add list of redirects.',
+                        $this->uniqueId . ":" . $this->action->id,
+                        'danger',
+                        1
+                    );
+
                     Yii::$app->getSession()->setFlash(
                         'danger',
                         Yii::t(
@@ -178,7 +194,15 @@ public function actionCreate()
 
             } else {
                 if ($model->load($post)) {
-                    if($model->save()) {
+                    if ($model->save()) {
+                        // Log activity
+                        $this->module->logActivity(
+                            'Redirect (' . $model->code . ') for `' . $model->request_url . '` to `' . $model->redirect_url . '` successfully added.',
+                            $this->uniqueId . ":" . $this->action->id,
+                            'success',
+                            1
+                        );
+
                         Yii::$app->getSession()->setFlash(
                             'success',
                             Yii::t(
@@ -193,6 +217,14 @@ public function actionCreate()
                         );
                         return $this->redirect(['index']);
                     } else {
+                        // Log activity
+                        $this->module->logActivity(
+                            'An error occurred while adding a ' . $model->code . '-redirect for `' . $model->request_url . '` to `' . $model->redirect_url . '`.',
+                            $this->uniqueId . ":" . $this->action->id,
+                            'danger',
+                            1
+                        );
+
                         Yii::$app->getSession()->setFlash(
                             'danger',
                             Yii::t(
@@ -233,7 +265,15 @@ public function actionUpdate($id)
         }
 
         if ($model->load(Yii::$app->request->post())) {
-            if($model->save()) {
+            if ($model->save()) {
+                // Log activity
+                $this->module->logActivity(
+                    'Redirect (' . $model->code . ') for `' . $model->request_url . '` to `' . $model->redirect_url . '` successfully updated.',
+                    $this->uniqueId . ":" . $this->action->id,
+                    'success',
+                    1
+                );
+
                 Yii::$app->getSession()->setFlash(
                     'success',
                     Yii::t(
@@ -247,6 +287,14 @@ public function actionUpdate($id)
                     )
                 );
             } else {
+                // Log activity
+                $this->module->logActivity(
+                    'An error occurred while updating a ' . $model->code . '-redirect for `' . $model->request_url . '` to `' . $model->redirect_url . '`.',
+                    $this->uniqueId . ":" . $this->action->id,
+                    'danger',
+                    1
+                );
+
                 Yii::$app->getSession()->setFlash(
                     'danger',
                     Yii::t(
@@ -281,7 +329,15 @@ public function actionDelete($id)
     {
 
         $model = $this->findModel($id);
-        if($model->delete()) {
+        if ($model->delete()) {
+            // Log activity
+            $this->module->logActivity(
+                'Redirect (' . $model->code . ') for `' . $model->request_url . '` to `' . $model->redirect_url . '` successfully deleted.',
+                $this->uniqueId . ":" . $this->action->id,
+                'success',
+                1
+            );
+
             Yii::$app->getSession()->setFlash(
                 'success',
                 Yii::t(
@@ -295,6 +351,14 @@ public function actionDelete($id)
                 )
             );
         } else {
+            // Log activity
+            $this->module->logActivity(
+                'An error occurred while deleting a ' . $model->code . '-redirect for `' . $model->request_url . '` to `' . $model->redirect_url . '`.',
+                $this->uniqueId . ":" . $this->action->id,
+                'danger',
+                1
+            );
+
             Yii::$app->getSession()->setFlash(
                 'danger',
                 Yii::t(
@@ -328,6 +392,14 @@ public function actionImport() {
                 $redirects = file_get_contents($import->tempName);
                 if ($data = Json::decode($redirects)) {
                     if ($model->import($data)) {
+                        // Log activity
+                        $this->module->logActivity(
+                            'Redirects successfully imported/updated.',
+                            $this->uniqueId . ":" . $this->action->id,
+                            'success',
+                            1
+                        );
+
                         Yii::$app->getSession()->setFlash(
                             'success',
                             Yii::t(
@@ -337,6 +409,14 @@ public function actionImport() {
                         );
                     }
                 } else {
+                    // Log activity
+                    $this->module->logActivity(
+                        'An error occurred while importing/updating redirects.',
+                        $this->uniqueId . ":" . $this->action->id,
+                        'danger',
+                        1
+                    );
+
                     Yii::$app->getSession()->setFlash(
                         'danger',
                         Yii::t(