Skip to content

Commit 3c8789a

Browse files
alex-wdmgalex-wdmg
committed
Fixed error determining loading of common modules. Rebased to base ActiveRecord model.
1 parent d987248 commit 3c8789a

File tree

8 files changed

+61
-31
lines changed

8 files changed

+61
-31
lines changed

‎controllers/AttachmentsController.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,16 +63,16 @@ public function beforeAction($action)
6363
$modules = array();
6464
$session = Yii::$app->session;
6565

66-
if(!isset(Yii::$app->modules['users']))
66+
if (!$this->module->moduleLoaded('users'))
6767
$modules[] = '«Users»';
6868

69-
if(!isset(Yii::$app->modules['tasks']))
69+
if (!$this->module->moduleLoaded('tasks'))
7070
$modules[] = '«Tasks»';
7171

72-
if(isset($session['viewed-flash']) && is_array($session['viewed-flash']))
72+
if (isset($session['viewed-flash']) && is_array($session['viewed-flash']))
7373
$viewed = $session['viewed-flash'];
7474

75-
if(count($modules) > 0 && !in_array('tickets-need-modules', $viewed) && is_array($viewed)) {
75+
if (count($modules) > 0 && !in_array('tickets-need-modules', $viewed) && is_array($viewed)) {
7676
Yii::$app->getSession()->setFlash(
7777
'warning',
7878
Yii::t(

‎controllers/ItemController.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,16 @@ public function beforeAction($action)
6666
$modules = array();
6767
$session = Yii::$app->session;
6868

69-
if(!isset(Yii::$app->modules['users']))
69+
if (!$this->module->moduleLoaded('users'))
7070
$modules[] = '«Users»';
7171

72-
if(!isset(Yii::$app->modules['tasks']))
72+
if (!$this->module->moduleLoaded('tasks'))
7373
$modules[] = '«Tasks»';
7474

75-
if(isset($session['viewed-flash']) && is_array($session['viewed-flash']))
75+
if (isset($session['viewed-flash']) && is_array($session['viewed-flash']))
7676
$viewed = $session['viewed-flash'];
7777

78-
if(count($modules) > 0 && !in_array('tickets-need-modules', $viewed) && is_array($viewed)) {
78+
if (count($modules) > 0 && !in_array('tickets-need-modules', $viewed) && is_array($viewed)) {
7979
Yii::$app->getSession()->setFlash(
8080
'warning',
8181
Yii::t(
@@ -91,7 +91,6 @@ public function beforeAction($action)
9191
}
9292

9393
parent::setViewPath('@vendor/wdmg/yii2-tickets/views/tickets');
94-
9594
return parent::beforeAction($action);
9695
}
9796

‎controllers/ListController.php

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,16 +70,16 @@ public function beforeAction($action)
7070
$required = array();
7171
$session = Yii::$app->session;
7272

73-
if(!isset(Yii::$app->extensions['wdmg/yii2-users']) && !$this->module->moduleLoaded('users'))
73+
if (!$this->module->moduleLoaded('users'))
7474
$required[] = '«Users»';
7575

76-
if(!isset(Yii::$app->extensions['wdmg/yii2-tasks']) && !$this->module->moduleLoaded('tasks'))
76+
if (!$this->module->moduleLoaded('tasks'))
7777
$required[] = '«Tasks»';
7878

79-
if(isset($session['viewed-flash']) && is_array($session['viewed-flash']))
79+
if (isset($session['viewed-flash']) && is_array($session['viewed-flash']))
8080
$viewed = $session['viewed-flash'];
8181

82-
if(count($required) > 0 && !in_array('tickets-need-modules', $viewed) && is_array($viewed)) {
82+
if (count($required) > 0 && !in_array('tickets-need-modules', $viewed) && is_array($viewed)) {
8383
Yii::$app->getSession()->setFlash(
8484
'warning',
8585
Yii::t(
@@ -93,10 +93,8 @@ public function beforeAction($action)
9393
);
9494
$session['viewed-flash'] = array_merge(array_unique($viewed), ['tickets-need-modules']);
9595
}
96-
97-
// Set custom view path
96+
9897
parent::setViewPath('@vendor/wdmg/yii2-tickets/views/tickets');
99-
10098
return parent::beforeAction($action);
10199
}
102100

‎controllers/MessagesController.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,16 +63,16 @@ public function beforeAction($action)
6363
$modules = array();
6464
$session = Yii::$app->session;
6565

66-
if(!isset(Yii::$app->modules['users']))
66+
if (!$this->module->moduleLoaded('users'))
6767
$modules[] = '«Users»';
6868

69-
if(!isset(Yii::$app->modules['tasks']))
69+
if (!$this->module->moduleLoaded('tasks'))
7070
$modules[] = '«Tasks»';
7171

72-
if(isset($session['viewed-flash']) && is_array($session['viewed-flash']))
72+
if (isset($session['viewed-flash']) && is_array($session['viewed-flash']))
7373
$viewed = $session['viewed-flash'];
7474

75-
if(count($modules) > 0 && !in_array('tickets-need-modules', $viewed) && is_array($viewed)) {
75+
if (count($modules) > 0 && !in_array('tickets-need-modules', $viewed) && is_array($viewed)) {
7676
Yii::$app->getSession()->setFlash(
7777
'warning',
7878
Yii::t(

‎models/Tickets.php

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace wdmg\tickets\models;
44

55
use Yii;
6+
use \wdmg\base\models\ActiveRecord;
67
use \yii\behaviors\TimeStampBehavior;
78

89
/**
@@ -24,7 +25,7 @@
2425
* @property TicketsAttachments[] $ticketsAttachments
2526
* @property TicketsMessages[] $ticketsMessages
2627
*/
27-
class Tickets extends \yii\db\ActiveRecord
28+
class Tickets extends ActiveRecord
2829
{
2930

3031
/**
@@ -51,6 +52,11 @@ class Tickets extends \yii\db\ActiveRecord
5152
const TK_LABEL_SKIPPED = 9;
5253
const TK_LABEL_WONTFIX = 10;
5354

55+
/**
56+
* @var Instance of current module
57+
*/
58+
private $_module;
59+
5460
/**
5561
* {@inheritdoc}
5662
*/
@@ -62,6 +68,15 @@ public static function tableName()
6268
/**
6369
* {@inheritdoc}
6470
*/
71+
public function init()
72+
{
73+
parent::init();
74+
$this->_module = parent::getModule(true);
75+
}
76+
77+
/**
78+
* {@inheritdoc}
79+
*/
6580
public function behaviors()
6681
{
6782
return [
@@ -90,7 +105,7 @@ public function rules()
90105
[['subject', 'access_token'], 'string', 'max' => 255],
91106
];
92107

93-
if(class_exists('\wdmg\tasks\models\Tasks') && isset(Yii::$app->modules['tasks']))
108+
if(class_exists('\wdmg\tasks\models\Tasks') && $this->_module->moduleLoaded('tasks'))
94109
$rules[] = [['task_id'], 'exist', 'skipOnError' => true, 'targetClass' => \wdmg\tasks\models\Tasks::class, 'targetAttribute' => ['task_id' => 'id']];
95110

96111
return $rules;
@@ -122,7 +137,7 @@ public function attributeLabels()
122137
*/
123138
public function getTask()
124139
{
125-
if(class_exists('\wdmg\tasks\models\Tasks') && isset(Yii::$app->modules['tasks']))
140+
if (class_exists('\wdmg\tasks\models\Tasks') && $this->_module->moduleLoaded('tasks'))
126141
return $this->hasOne(\wdmg\tasks\models\Tasks::class, ['id' => 'task_id']);
127142
else
128143
return null;
@@ -133,7 +148,7 @@ public function getTask()
133148
*/
134149
public function getSubunit()
135150
{
136-
if(class_exists('\wdmg\tasks\models\TasksSubunits') && isset(Yii::$app->modules['tasks']))
151+
if (class_exists('\wdmg\tasks\models\TasksSubunits') && $this->_module->moduleLoaded('tasks'))
137152
return $this->hasOne(\wdmg\tasks\models\TasksSubunits::class, ['id' => 'subunit_id']);
138153
else
139154
return null;
@@ -160,7 +175,7 @@ public function getTicketsMessages()
160175
*/
161176
public function getAssigned()
162177
{
163-
if(class_exists('\wdmg\users\models\Users') && isset(Yii::$app->modules['users']))
178+
if (class_exists('\wdmg\users\models\Users') && $this->_module->moduleLoaded('users'))
164179
return $this->hasOne(\wdmg\users\models\Users::class, ['id' => 'assigned_id']);
165180
else
166181
return null;
@@ -171,9 +186,9 @@ public function getAssigned()
171186
*/
172187
public function getUser($user_id = null)
173188
{
174-
if(class_exists('\wdmg\users\models\Users') && isset(Yii::$app->modules['users']) && !$user_id)
189+
if (class_exists('\wdmg\users\models\Users') && $this->_module->moduleLoaded('users') && !$user_id)
175190
return $this->hasOne(\wdmg\users\models\Users::class, ['id' => 'user_id']);
176-
else if(class_exists('\wdmg\users\models\Users') && isset(Yii::$app->modules['users']) && $user_id)
191+
else if (class_exists('\wdmg\users\models\Users') && $this->_module->moduleLoaded('users') && $user_id)
177192
return \wdmg\users\models\Users::findOne(['id' => intval($user_id)]);
178193
else
179194
return null;

‎models/TicketsAttachments.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace wdmg\tickets\models;
44

55
use Yii;
6+
use \wdmg\base\models\ActiveRecord;
67
use \yii\behaviors\TimeStampBehavior;
78

89
/**
@@ -19,8 +20,14 @@
1920
* @property Tickets $ticket
2021
* @property TicketsMessages[] $ticketsMessages
2122
*/
22-
class TicketsAttachments extends \yii\db\ActiveRecord
23+
class TicketsAttachments extends ActiveRecord
2324
{
25+
26+
/**
27+
* @var Instance of current module
28+
*/
29+
private $_module;
30+
2431
/**
2532
* {@inheritdoc}
2633
*/

‎models/TicketsMessages.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace wdmg\tickets\models;
44

55
use Yii;
6+
use \wdmg\base\models\ActiveRecord;
67
use \yii\behaviors\TimeStampBehavior;
78

89
/**
@@ -19,9 +20,14 @@
1920
* @property TicketsAttachments $attachment
2021
* @property Tickets $ticket
2122
*/
22-
class TicketsMessages extends \yii\db\ActiveRecord
23+
class TicketsMessages extends ActiveRecord
2324
{
2425

26+
/**
27+
* @var Instance of current module
28+
*/
29+
private $_module;
30+
2531
/**
2632
* {@inheritdoc}
2733
*/
@@ -102,7 +108,7 @@ public function getTicket()
102108
*/
103109
public function getSender()
104110
{
105-
if(class_exists('\wdmg\users\models\Users') && isset(Yii::$app->modules['users']))
111+
if(class_exists('\wdmg\users\models\Users') && $this->_module->moduleLoaded('users'))
106112
return $this->hasOne(\wdmg\users\models\Users::class, ['id' => 'sender_id']);
107113
else
108114
return null;

‎models/TicketsSearch.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ class TicketsSearch extends Tickets
2828
*/
2929
public $executor;
3030

31+
/**
32+
* @var Instance of current module
33+
*/
34+
private $_module;
35+
3136
/**
3237
* {@inheritdoc}
3338
*/
@@ -89,7 +94,7 @@ public function search($params, $current_user = null)
8994
]);
9095

9196
// custom search: get task_id requested by title
92-
if(!is_int($this->task_id) && !empty($this->task_id) && (class_exists('\wdmg\tasks\models\Tasks') && isset(Yii::$app->modules['tasks']))) {
97+
if(!is_int($this->task_id) && !empty($this->task_id) && (class_exists('\wdmg\tasks\models\Tasks') && $this->_module->moduleLoaded('tasks'))) {
9398
$task_id = \wdmg\tasks\models\Tasks::find()->andFilterWhere(['like', 'title', $this->task_id])->one();
9499
$query->andFilterWhere(['task_id' => $task_id]);
95100
} else {

0 commit comments

Comments
 (0)