Update dependencies, README.md

CHANGELOG.md

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+## 1.1.9 (2020-07-01)
+ * Update dependencies, README.md
+ * Fixed error determining loading of common modules
+ * Rebased to base ActiveRecord model
+
 ## 1.1.8 (2020-03-27)
  * Added pagination
  * Up to date dependencies
@@ -18,7 +23,7 @@ Changelog
  * Module refactoring
 
 ## 1.1.3 (2019-06-05)
- * Module transferred to base module interface. Update Yii2 version.
+ * Module transferred to base module interface. Update Yii2 version
 
 ## 1.1.2 (2019-06-01)
  * Bugfix, routing and refactoring

Module.php

@@ -6,7 +6,7 @@
  * Yii2 Tickets
  *
  * @category        Module
- * @version         1.1.8
+ * @version         1.1.9
  * @author          Alexsander Vyshnyvetskyy <[email protected]>
  * @link            https://github.com/wdmg/yii2-tickets
  * @copyright       Copyright (c) 2019 - 2020 W.D.M.Group, Ukraine
@@ -45,7 +45,7 @@ class Module extends BaseModule
     /**
      * @var string the module version
      */
-    private $version = "1.1.8";
+    private $version = "1.1.9";
 
     /**
      * @var integer, priority of initialization

README.md

@@ -1,15 +1,21 @@
-[![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-tickets.svg)](https://packagist.org/packages/wdmg/yii2-tickets)
 [![Packagist Version](https://img.shields.io/packagist/v/wdmg/yii2-tickets.svg)](https://packagist.org/packages/wdmg/yii2-tickets)
-![Progress](https://img.shields.io/badge/progress-in_development-red.svg)
+![Progress](https://img.shields.io/badge/progress-ready_to_use-green.svg)
 [![GitHub license](https://img.shields.io/github/license/wdmg/yii2-tickets.svg)](https://github.com/wdmg/yii2-tickets/blob/master/LICENSE)
 
+<img src="./docs/images/yii2-tickets.png" width="100%" alt="Yii2 Tickets Module" />
+
 # Yii2 Tickets Module
-Ticket system for Yii2
+Ticket system for Yii2.
+
+This module is an integral part of the [Butterfly.СMS](https://butterflycms.com/) content management system, but can also be used as an standalone extension.
+
+Copyrights (c) 2019-2020 [W.D.M.Group, Ukraine](https://wdmg.com.ua/)
 
 # 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 Editor](https://github.com/wdmg/yii2-editor) module
 * [Yii2 Tasks](https://github.com/wdmg/yii2-tasks) module (optionaly)
@@ -60,7 +66,8 @@ Use the `Module::dashboardNavItems()` method of the module to generate a navigat
     ?>
 
 
-# Status and version [in progress development]
+# Status and version [ready to use]
+* v.1.1.9 - Update dependencies, README.md
 * v.1.1.8 - Added pagination, up to date dependencies
 * v.1.1.7 - Fixed deprecated class declaration
 * v.1.1.6 - Added extra options to composer.json and navbar menu icon

composer.json

@@ -4,7 +4,7 @@
   "keywords": ["yii2", "yii2-tickets", "ticket system", "wdmg"],
   "type": "yii2-extension",
   "license": "MIT",
-  "version": "1.1.8",
+  "version": "1.1.9",
   "homepage": "https://github.com/wdmg/yii2-tickets",
   "support": {
     "source": "https://github.com/wdmg/yii2-tickets",
@@ -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.4",
     "wdmg/yii2-editor": "^1.0.10",
     "wdmg/yii2-helpers": "^1.3.2"
   },

controllers/ListController.php

@@ -93,7 +93,7 @@ public function beforeAction($action)
             );
             $session['viewed-flash'] = array_merge(array_unique($viewed), ['tickets-need-modules']);
         }
-        
+
         parent::setViewPath('@vendor/wdmg/yii2-tickets/views/tickets');
         return parent::beforeAction($action);
     }

messages/ru-RU/app/modules/tickets.php

@@ -37,7 +37,7 @@
 
     'Open' => 'Открыт',
     'Waiting' => 'Ожидание',
-    'In Work' => 'В работе',
+    'In work' => 'В работе',
     'Closed' => 'Закрыт',
 
     'Label' => 'Метка',
@@ -52,6 +52,8 @@
     'Skipped' => 'Пропуск',
     'Wontfix' => 'Не исправить',
 
+    'Change ticket status on' => 'Изменить статус тикета на',
+
     'View ticket: {name}' => 'Просмотр тикета: {name}',
     'Update ticket: {name}' => 'Редактирование тикета: {name}',
 

models/Tickets.php

@@ -74,7 +74,7 @@ public function init()
         $this->_module = parent::getModule(true);
     }
 
-        /**
+    /**
      * {@inheritdoc}
      */
     public function behaviors()
@@ -198,11 +198,11 @@ public function getUser($user_id = null)
      * Return all ticket status
      * @return array
      */
-    public static function getAllStatus()
+    public static function getAllStatusesList()
     {
         return [
             self::TK_STATUS_OPEN => Yii::t('app/modules/tickets', 'Open'),
-            self::TK_STATUS_WATING => Yii::t('app/modules/tickets', 'Wating'),
+            self::TK_STATUS_WATING => Yii::t('app/modules/tickets', 'Waiting'),
             self::TK_STATUS_INWORK => Yii::t('app/modules/tickets', 'In work'),
             self::TK_STATUS_CLOSED => Yii::t('app/modules/tickets', 'Closed')
         ];
@@ -212,7 +212,7 @@ public static function getAllStatus()
      * Return all ticket labels
      * @return array
      */
-    public static function getAllLabels()
+    public static function getAllLabelsList()
     {
         return [
             self::TK_LABEL_UNLABELED => Yii::t('app/modules/tickets', 'Unlabeled'),

models/TicketsMessages.php

@@ -36,6 +36,15 @@ public static function tableName()
         return '{{%tickets_messages}}';
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function init()
+    {
+        parent::init();
+        $this->_module = parent::getModule(true);
+    }
+
     /**
      * {@inheritdoc}
      */

views/tickets/_form.php

@@ -1,5 +1,6 @@
 <?php
 
+use wdmg\widgets\SelectInput;
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
 use wdmg\widgets\Editor;
@@ -30,9 +31,21 @@
 
     <?= $form->field($model, 'access_token')->textInput(['readonly' => true]) ?>
 
-    <?= $form->field($model, 'label')->dropDownList($model::getAllLabels()); ?>
-
-    <?= $form->field($model, 'status')->dropDownList($model::getAllStatus()); ?>
+    <?= $form->field($model, 'label')->widget(SelectInput::class, [
+        'items' => $model->getAllLabelsList(),
+        'options' => [
+            'id' => 'ticket-form-label',
+            'class' => 'form-control'
+        ]
+    ]); ?>
+
+    <?= $form->field($model, 'status')->widget(SelectInput::class, [
+        'items' => $model->getAllStatusesList(),
+        'options' => [
+            'id' => 'ticket-form-status',
+            'class' => 'form-control'
+        ]
+    ]); ?>
 
     <hr/>
     <div class="form-group">

views/tickets/all.php

@@ -35,12 +35,12 @@
             ],
             [
                 'attribute' => 'user_id',
-                'format' => 'html',
+                'format' => 'raw',
                 'header' => Yii::t('app/modules/tickets', 'User'),
                 'value' => function($model) {
                     if($model->user_id == $model->user['id'])
                         if($model->user['id'] && $model->user['username'])
-                            return Html::a($model->user['username'], ['../admin/users/view/?id='.$model->user['id']], [
+                            return Html::a($model->user['username'], ['../users/users/view', 'id' => $model->user['id']], [
                                 'target' => '_blank',
                                 'data-pjax' => 0
                             ]);
@@ -52,12 +52,12 @@
             ],
             [
                 'attribute' => 'assigned_id',
-                'format' => 'html',
+                'format' => 'raw',
                 'header' => Yii::t('app/modules/tickets', 'Assigned user'),
                 'value' => function($model) {
                     if($model->assigned_id == $model->assigned['id'])
                         if($model->assigned['id'] && $model->assigned['username'])
-                            return Html::a($model->assigned['username'], ['../admin/users/view/?id='.$model->assigned['id']], [
+                            return Html::a($model->assigned['username'], ['../users/users/view', 'id' => $model->assigned['id']], [
                                 'target' => '_blank',
                                 'data-pjax' => 0
                             ]);
@@ -69,12 +69,12 @@
             ],
             [
                 'attribute' => 'task_id',
-                'format' => 'html',
+                'format' => 'raw',
                 'header' => Yii::t('app/modules/tickets', 'Task'),
                 'value' => function($model) {
                     if($model->task_id == $model->task['id'])
                         if($model->task['id'] && $model->task['title'])
-                            return Html::a($model->task['title'], ['../admin/tasks/item/view/?id='.$model->task['id']], [
+                            return Html::a($model->task['title'], ['../tasks/item/view', 'id' => $model->task['id']], [
                                 'target' => '_blank',
                                 'data-pjax' => 0
                             ]);
@@ -86,12 +86,12 @@
             ],
             [
                 'attribute' => 'subunit_id',
-                'format' => 'html',
+                'format' => 'raw',
                 'header' => Yii::t('app/modules/tickets', 'Subunit'),
                 'value' => function($model) {
                     if($model->subunit_id == $model->subunit['id'])
                         if($model->subunit['id'] && $model->subunit['title'])
-                            return Html::a($model->subunit['title'], ['../admin/tasks/subunits/view/?id='.$model->subunit['id']], [
+                            return Html::a($model->subunit['title'], ['../tasks/subunits/view', 'id' => $model->subunit['id']], [
                                 'target' => '_blank',
                                 'data-pjax' => 0
                             ]);

views/tickets/current.php

@@ -30,12 +30,12 @@
             'message:ntext',
             [
                 'attribute' => 'user_id',
-                'format' => 'html',
+                'format' => 'raw',
                 'header' => Yii::t('app/modules/tickets', 'Assigned user'),
                 'value' => function($model) {
                     if($model->user_id == $model->user['id'])
                         if($model->user['id'] && $model->user['username'])
-                            return Html::a($model->user['username'], ['../admin/users/view/?id='.$model->user['id']], [
+                            return Html::a($model->user['username'], ['../users/users/view', 'id' => $model->user['id']], [
                                 'target' => '_blank',
                                 'data-pjax' => 0
                             ]);
@@ -47,12 +47,12 @@
             ],
             [
                 'attribute' => 'task_id',
-                'format' => 'html',
+                'format' => 'raw',
                 'header' => Yii::t('app/modules/tickets', 'Task'),
                 'value' => function($model) {
                     if($model->task_id == $model->task['id'])
                         if($model->task['id'] && $model->task['title'])
-                            return Html::a($model->task['title'], ['../admin/tasks/item/view/?id='.$model->task['id']], [
+                            return Html::a($model->task['title'], ['../tasks/item/view', 'id' => $model->task['id']], [
                                 'target' => '_blank',
                                 'data-pjax' => 0
                             ]);
@@ -64,12 +64,12 @@
             ],
             [
                 'attribute' => 'subunit_id',
-                'format' => 'html',
+                'format' => 'raw',
                 'header' => Yii::t('app/modules/tickets', 'Subunit'),
                 'value' => function($model) {
                     if($model->subunit_id == $model->subunit['id'])
                         if($model->subunit['id'] && $model->subunit['title'])
-                            return Html::a($model->subunit['title'], ['../admin/tasks/subunits/view/?id='.$model->subunit['id']], [
+                            return Html::a($model->subunit['title'], ['../tasks/subunits/view', 'id' => $model->subunit['id']], [
                                 'target' => '_blank',
                                 'data-pjax' => 0
                             ]);

views/tickets/my.php

@@ -36,12 +36,12 @@
             ],
             [
                 'attribute' => 'user_id',
-                'format' => 'html',
+                'format' => 'raw',
                 'header' => Yii::t('app/modules/tickets', 'User'),
                 'value' => function($model) {
                     if($model->user_id == $model->user['id'])
                         if($model->user['id'] && $model->user['username'])
-                            return Html::a($model->user['username'], ['../admin/users/view/?id='.$model->user['id']], [
+                            return Html::a($model->user['username'], ['../users/users/view', 'id' => $model->user['id']], [
                                 'target' => '_blank',
                                 'data-pjax' => 0
                             ]);
@@ -53,12 +53,12 @@
             ],
             [
                 'attribute' => 'task_id',
-                'format' => 'html',
+                'format' => 'raw',
                 'header' => Yii::t('app/modules/tickets', 'Task'),
                 'value' => function($model) {
                     if($model->task_id == $model->task['id'])
                         if($model->task['id'] && $model->task['title'])
-                            return Html::a($model->task['title'], ['../admin/tasks/item/view/?id='.$model->task['id']], [
+                            return Html::a($model->task['title'], ['../tasks/item/view', 'id' => $model->task['id']], [
                                 'target' => '_blank',
                                 'data-pjax' => 0
                             ]);
@@ -70,12 +70,12 @@
             ],
             [
                 'attribute' => 'subunit_id',
-                'format' => 'html',
+                'format' => 'raw',
                 'header' => Yii::t('app/modules/tickets', 'Subunit'),
                 'value' => function($model) {
                     if($model->subunit_id == $model->subunit['id'])
                         if($model->subunit['id'] && $model->subunit['title'])
-                            return Html::a($model->subunit['title'], ['../admin/tasks/subunits/view/?id='.$model->subunit['id']], [
+                            return Html::a($model->subunit['title'], ['../tasks/subunits/view', 'id' => $model->subunit['id']], [
                                 'target' => '_blank',
                                 'data-pjax' => 0
                             ]);

views/tickets/view.php

@@ -233,7 +233,7 @@
     <hr/>
     <?php if ($model->status !== $model::TK_STATUS_CLOSED) : ?>
         <div class="form-group">
-            <label><?= Yii::t('app/modules/tickets', 'Change task status on') ?>: </label>
+            <label><?= Yii::t('app/modules/tickets', 'Change ticket status on') ?>: </label>
             <?php
 
                 if($model->status !== $model::TK_STATUS_OPEN)