Skip to content

Commit e6ad85f

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

File tree

7 files changed

+41
-27
lines changed

7 files changed

+41
-27
lines changed

‎controllers/ItemController.php

Lines changed: 4 additions & 5 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['tickets']))
69+
if (!$this->module->moduleLoaded('tickets'))
7070
$modules[] = '«Tickets»';
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('tasks-need-modules', $viewed) && is_array($viewed)) {
75+
if (count($modules) > 0 && !in_array('tasks-need-modules', $viewed) && is_array($viewed)) {
7676
Yii::$app->getSession()->setFlash(
7777
'warning',
7878
Yii::t(
@@ -88,7 +88,6 @@ public function beforeAction($action)
8888
}
8989

9090
parent::setViewPath('@vendor/wdmg/yii2-tasks/views/tasks');
91-
9291
return parent::beforeAction($action);
9392
}
9493

‎controllers/ListController.php

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

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

75-
if(!isset(Yii::$app->extensions['wdmg/yii2-tickets']) && !$this->module->moduleLoaded('tickets'))
75+
if (!$this->module->moduleLoaded('tickets'))
7676
$required[] = '«Tickets»';
7777

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

8181
if(count($required) > 0 && !in_array('tasks-need-modules', $viewed) && is_array($viewed)) {
@@ -93,9 +93,7 @@ public function beforeAction($action)
9393
$session['viewed-flash'] = array_merge(array_unique($viewed), ['tasks-need-modules']);
9494
}
9595

96-
// Set custom view path
9796
parent::setViewPath('@vendor/wdmg/yii2-tasks/views/tasks');
98-
9997
return parent::beforeAction($action);
10098
}
10199

‎controllers/SubunitsController.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['tickets']))
69+
if (!$this->module->moduleLoaded('tickets'))
7070
$modules[] = '«Tickets»';
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('tasks-need-modules', $viewed) && is_array($viewed)) {
75+
if (count($modules) > 0 && !in_array('tasks-need-modules', $viewed) && is_array($viewed)) {
7676
Yii::$app->getSession()->setFlash(
7777
'warning',
7878
Yii::t(

‎controllers/WorkflowController.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['tickets']))
69+
if (!$this->module->moduleLoaded('tickets'))
7070
$modules[] = '«Tickets»';
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('tasks-need-modules', $viewed) && is_array($viewed)) {
75+
if (count($modules) > 0 && !in_array('tasks-need-modules', $viewed) && is_array($viewed)) {
7676
Yii::$app->getSession()->setFlash(
7777
'warning',
7878
Yii::t(

‎models/Tasks.php

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

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

89
/**
@@ -24,7 +25,7 @@
2425
* @property TasksWorkflow[] $tasksWorkflows
2526
* @property Tickets[] $tickets
2627
*/
27-
class Tasks extends \yii\db\ActiveRecord
28+
class Tasks extends ActiveRecord
2829
{
2930

3031
/**
@@ -38,6 +39,11 @@ class Tasks extends \yii\db\ActiveRecord
3839
const TS_STATUS_SUSPENDED = 50;
3940
const TS_STATUS_CANCELED = 60;
4041

42+
/**
43+
* @var Instance of current module
44+
*/
45+
private $_module;
46+
4147
/**
4248
* {@inheritdoc}
4349
*/
@@ -46,6 +52,15 @@ public static function tableName()
4652
return '{{%tasks}}';
4753
}
4854

55+
/**
56+
* {@inheritdoc}
57+
*/
58+
public function init()
59+
{
60+
parent::init();
61+
$this->_module = parent::getModule(true);
62+
}
63+
4964
/**
5065
* {@inheritdoc}
5166
*/
@@ -78,7 +93,7 @@ public function rules()
7893
[['title'], 'string', 'max' => 255],
7994
];
8095

81-
if(class_exists('\wdmg\tickets\models\Tickets') && isset(Yii::$app->modules['tickets']))
96+
if(class_exists('\wdmg\tickets\models\Tickets') && $this->_module->moduleLoaded('tickets'))
8297
$rules[] = [['ticket_id'], 'exist', 'skipOnError' => true, 'targetClass' => \wdmg\tickets\models\Tickets::class, 'targetAttribute' => ['ticket_id' => 'id']];
8398

8499
return $rules;
@@ -118,7 +133,7 @@ public function getTasksWorkflows()
118133
*/
119134
public function getTicket()
120135
{
121-
if(class_exists('\wdmg\tickets\models\Tickets') && isset(Yii::$app->modules['tickets']))
136+
if (class_exists('\wdmg\tickets\models\Tickets') && $this->_module->moduleLoaded('tickets'))
122137
return $this->hasOne(\wdmg\tickets\models\Tickets::class, ['id' => 'ticket_id']);
123138
else
124139
return null;
@@ -129,7 +144,7 @@ public function getTicket()
129144
*/
130145
public function getOwner()
131146
{
132-
if(class_exists('\wdmg\users\models\Users') && isset(Yii::$app->modules['users']))
147+
if (class_exists('\wdmg\users\models\Users') && $this->_module->moduleLoaded('users'))
133148
return $this->hasOne(\wdmg\users\models\Users::class, ['id' => 'owner_id']);
134149
else
135150
return null;
@@ -140,7 +155,7 @@ public function getOwner()
140155
*/
141156
public function getExecutor()
142157
{
143-
if(class_exists('\wdmg\users\models\Users') && isset(Yii::$app->modules['users']))
158+
if (class_exists('\wdmg\users\models\Users') && $this->_module->moduleLoaded('users'))
144159
return $this->hasOne(\wdmg\users\models\Users::class, ['id' => 'executor_id']);
145160
else
146161
return null;
@@ -151,9 +166,9 @@ public function getExecutor()
151166
*/
152167
public function getUser($user_id = null)
153168
{
154-
if(class_exists('\wdmg\users\models\Users') && isset(Yii::$app->modules['users']) && !$user_id)
169+
if (class_exists('\wdmg\users\models\Users') && $this->_module->moduleLoaded('users') && !$user_id)
155170
return $this->hasOne(\wdmg\users\models\Users::class, ['id' => 'user_id']);
156-
else if(class_exists('\wdmg\users\models\Users') && isset(Yii::$app->modules['users']) && $user_id)
171+
else if (class_exists('\wdmg\users\models\Users') && $this->_module->moduleLoaded('users') && $user_id)
157172
return \wdmg\users\models\Users::findOne(['id' => intval($user_id)]);
158173
else
159174
return null;

‎models/TasksSubunits.php

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

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

89
/**
@@ -17,7 +18,7 @@
1718
* @property string $updated_at
1819
* @property int $status
1920
*/
20-
class TasksSubunits extends \yii\db\ActiveRecord
21+
class TasksSubunits extends ActiveRecord
2122
{
2223
/**
2324
* {@inheritdoc}

‎models/TasksWorkflow.php

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

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

89
/**
@@ -22,7 +23,7 @@
2223
*
2324
* @property Tasks $task
2425
*/
25-
class TasksWorkflow extends \yii\db\ActiveRecord
26+
class TasksWorkflow extends ActiveRecord
2627
{
2728
/**
2829
* {@inheritdoc}

0 commit comments

Comments
 (0)