diff --git a/src/User/Controller/AbstractAuthItemController.php b/src/User/Controller/AbstractAuthItemController.php
index 4b49465..76b01af 100644
--- a/src/User/Controller/AbstractAuthItemController.php
+++ b/src/User/Controller/AbstractAuthItemController.php
@@ -74,6 +74,7 @@ abstract class AbstractAuthItemController extends Controller
[
'searchModel' => $searchModel,
'dataProvider' => $searchModel->search(Yii::$app->request->get()),
+ 'module' => $this->module
]
);
}
@@ -101,6 +102,7 @@ abstract class AbstractAuthItemController extends Controller
[
'model' => $model,
'unassignedItems' => $this->authHelper->getUnassignedItems($model),
+ 'module' => $this->module
]
);
}
@@ -130,6 +132,7 @@ abstract class AbstractAuthItemController extends Controller
[
'model' => $model,
'unassignedItems' => $this->authHelper->getUnassignedItems($model),
+ 'module' => $this->module
]
);
}
diff --git a/src/User/Controller/AdminController.php b/src/User/Controller/AdminController.php
index b76c090..77919c2 100755
--- a/src/User/Controller/AdminController.php
+++ b/src/User/Controller/AdminController.php
@@ -178,7 +178,10 @@ class AdminController extends Controller
}
}
- return $this->render('_account', ['user' => $user]);
+ return $this->render('_account', [
+ 'user' => $user,
+ 'module' => $this->module
+ ]);
}
public function actionUpdateProfile($id)
@@ -211,6 +214,7 @@ class AdminController extends Controller
[
'user' => $user,
'profile' => $profile,
+ 'module' => $this->module
]
);
}
@@ -224,6 +228,7 @@ class AdminController extends Controller
'_info',
[
'user' => $user,
+ 'module' => $this->module
]
);
}
@@ -238,6 +243,7 @@ class AdminController extends Controller
[
'user' => $user,
'params' => Yii::$app->request->post(),
+ 'module' => $this->module
]
);
}
@@ -372,6 +378,7 @@ class AdminController extends Controller
'searchModel' => $searchModel,
'dataProvider' => $dataProvider,
'user' => $user,
+ 'module' => $this->module
]);
}
diff --git a/src/User/Controller/RuleController.php b/src/User/Controller/RuleController.php
index 4797f6a..f3a5f2c 100644
--- a/src/User/Controller/RuleController.php
+++ b/src/User/Controller/RuleController.php
@@ -67,6 +67,7 @@ class RuleController extends Controller
[
'searchModel' => $searchModel,
'dataProvider' => $dataProvider,
+ 'module' => $this->module
]
);
}
@@ -89,7 +90,8 @@ class RuleController extends Controller
return $this->render(
'create',
[
- 'model' => $model
+ 'model' => $model,
+ 'module' => $this->module
]
);
}
@@ -104,7 +106,7 @@ class RuleController extends Controller
[
'previousName' => $name,
'name' => $rule->name,
- 'className' => get_class($rule)
+ 'className' => get_class($rule),
]
);
@@ -123,6 +125,7 @@ class RuleController extends Controller
'update',
[
'model' => $model,
+ 'module' => $this->module
]
);
}
diff --git a/src/User/Service/MailService.php b/src/User/Service/MailService.php
index a0dfd0d..39b52ee 100644
--- a/src/User/Service/MailService.php
+++ b/src/User/Service/MailService.php
@@ -12,13 +12,16 @@
namespace Da\User\Service;
use Da\User\Contracts\ServiceInterface;
+use Da\User\Traits\ModuleAwareTrait;
use Yii;
use yii\mail\BaseMailer;
use yii\mail\MailerInterface;
class MailService implements ServiceInterface
{
- protected $viewPath = '@Da/User/resources/views/mail';
+ use ModuleAwareTrait;
+
+ protected $viewPath = '';
protected $type;
protected $from;
@@ -48,6 +51,7 @@ class MailService implements ServiceInterface
$this->view = $view;
$this->params = $params;
$this->mailer = $mailer;
+ $this->viewPath = $this->getModule()->viewPath . '/mail';
$this->mailer->setViewPath($this->viewPath);
$this->mailer->getView()->theme = Yii::$app->view->theme;
}
diff --git a/src/User/Widget/LoginWidget.php b/src/User/Widget/LoginWidget.php
index f4d2a54..df5729e 100644
--- a/src/User/Widget/LoginWidget.php
+++ b/src/User/Widget/LoginWidget.php
@@ -12,17 +12,22 @@
namespace Da\User\Widget;
use Da\User\Form\LoginForm;
+use Da\User\Traits\ModuleAwareTrait;
use Yii;
use yii\base\Widget;
+/**
+ * @deprecated this seems to be unused by this module. To be deleted in future!
+ */
class LoginWidget extends Widget
{
+ use ModuleAwareTrait;
public $validate = true;
public function run()
{
return $this->render(
- '@Da/User/resources/views/widgets/login/form',
+ $this->getModule()->$this->viewPath .'/widgets/login/form',
[
'model' => Yii::createObject(LoginForm::class),
]
diff --git a/src/User/resources/views/admin/_account.php b/src/User/resources/views/admin/_account.php
index e9d49e8..7b44021 100644
--- a/src/User/resources/views/admin/_account.php
+++ b/src/User/resources/views/admin/_account.php
@@ -14,10 +14,11 @@ use yii\helpers\Html;
/** @var yii\web\View $this */
/** @var Da\User\Model\User $user */
+/** @var \Da\User\Module $module */
?>
-beginContent('@Da/User/resources/views/admin/update.php', ['user' => $user]) ?>
+beginContent($module->viewPath. '/admin/update.php', ['user' => $user]) ?>
-beginContent('@Da/User/resources/views/admin/update.php', ['user' => $user]) ?>
+beginContent($module->viewPath. '/admin/update.php', ['user' => $user]) ?>
= yii\bootstrap\Alert::widget(
[
diff --git a/src/User/resources/views/admin/_info.php b/src/User/resources/views/admin/_info.php
index 1b929e7..a2de143 100644
--- a/src/User/resources/views/admin/_info.php
+++ b/src/User/resources/views/admin/_info.php
@@ -11,10 +11,11 @@
/** @var yii\web\View $this */
/** @var Da\User\Model\User $user */
+/** @var \Da\User\Module $module */
?>
-beginContent('@Da/User/resources/views/admin/update.php', ['user' => $user]) ?>
+beginContent($module->viewPath. '/admin/update.php', ['user' => $user]) ?>
diff --git a/src/User/resources/views/admin/_profile.php b/src/User/resources/views/admin/_profile.php
index e9c96e9..17994be 100644
--- a/src/User/resources/views/admin/_profile.php
+++ b/src/User/resources/views/admin/_profile.php
@@ -16,11 +16,12 @@ use yii\helpers\Html;
* @var yii\web\View $this
* @var \Da\User\Model\User $user
* @var \Da\User\Model\Profile $profile
+ * @var \Da\User\Module $module
*/
?>
-beginContent('@Da/User/resources/views/admin/update.php', ['user' => $user]) ?>
+beginContent($module->viewPath. '/admin/update.php', ['user' => $user]) ?>
-beginContent('@Da/User/resources/views/admin/update.php', ['user' => $user]) ?>
+beginContent($module->viewPath. '/admin/update.php', ['user' => $user]) ?>
= Html::a(
diff --git a/src/User/resources/views/admin/index.php b/src/User/resources/views/admin/index.php
index d507e78..bfa57d5 100644
--- a/src/User/resources/views/admin/index.php
+++ b/src/User/resources/views/admin/index.php
@@ -27,7 +27,7 @@ $this->params['breadcrumbs'][] = $this->title;
$module = Yii::$app->getModule('user');
?>
-beginContent('@Da/User/resources/views/shared/admin_layout.php') ?>
+beginContent($module->viewPath . '/shared/admin_layout.php') ?>
diff --git a/src/User/resources/views/permission/create.php b/src/User/resources/views/permission/create.php
index 613a58a..8cc0236 100644
--- a/src/User/resources/views/permission/create.php
+++ b/src/User/resources/views/permission/create.php
@@ -13,6 +13,7 @@
* @var yii\web\View $this
* @var Da\User\Model\Permission $model
* @var string[] $unassignedItems
+ * @var \Da\User\Module $module
*/
$this->title = Yii::t('usuario', 'Create new permission');
@@ -20,7 +21,7 @@ $this->params['breadcrumbs'][] = $this->title;
?>
-beginContent('@Da/User/resources/views/shared/admin_layout.php') ?>
+beginContent($module->viewPath . '/shared/admin_layout.php') ?>
= $this->render(
'/permission/_form',
diff --git a/src/User/resources/views/permission/index.php b/src/User/resources/views/permission/index.php
index 3dcfa5f..65142bf 100644
--- a/src/User/resources/views/permission/index.php
+++ b/src/User/resources/views/permission/index.php
@@ -13,6 +13,7 @@
* @var \yii\data\ActiveDataProvider $dataProvider
* @var yii\web\View $this
* @var \Da\User\Search\PermissionSearch $searchModel
+ * @var \Da\User\Module $module
*/
use yii\grid\ActionColumn;
use yii\grid\GridView;
@@ -23,7 +24,7 @@ $this->params['breadcrumbs'][] = $this->title;
?>
-beginContent('@Da/User/resources/views/shared/admin_layout.php') ?>
+beginContent($module->viewPath . '/shared/admin_layout.php') ?>
= GridView::widget(
[
diff --git a/src/User/resources/views/permission/update.php b/src/User/resources/views/permission/update.php
index 592cf40..7b1ab44 100644
--- a/src/User/resources/views/permission/update.php
+++ b/src/User/resources/views/permission/update.php
@@ -13,6 +13,7 @@
* @var yii\web\View $this
* @var Da\User\Model\Permission $model
* @var string[] $unassignedItems
+ * @var \Da\User\Module $module
*/
$this->title = Yii::t('usuario', 'Update permission');
@@ -20,7 +21,7 @@ $this->params['breadcrumbs'][] = $this->title;
?>
-beginContent('@Da/User/resources/views/shared/admin_layout.php') ?>
+beginContent($module->viewPath . '/shared/admin_layout.php') ?>
= $this->render(
'/permission/_form',
diff --git a/src/User/resources/views/role/create.php b/src/User/resources/views/role/create.php
index 354a780..a821036 100644
--- a/src/User/resources/views/role/create.php
+++ b/src/User/resources/views/role/create.php
@@ -13,13 +13,14 @@
* @var yii\web\View $this
* @var \Da\User\Model\Role $model
* @var string[] $unassignedItems
+ * @var \Da\User\Module $module
*/
$this->title = Yii::t('usuario', 'Create new role');
$this->params['breadcrumbs'][] = $this->title;
?>
-beginContent('@Da/User/resources/views/shared/admin_layout.php') ?>
+beginContent($module->viewPath . '/shared/admin_layout.php') ?>
= $this->render(
'/role/_form',
diff --git a/src/User/resources/views/role/index.php b/src/User/resources/views/role/index.php
index 422d56e..5a7beb6 100644
--- a/src/User/resources/views/role/index.php
+++ b/src/User/resources/views/role/index.php
@@ -17,6 +17,7 @@ use yii\helpers\Url;
* @var \yii\data\DataProviderInterface $dataProvider
* @var \Da\User\Search\RoleSearch $searchModel
* @var yii\web\View $this
+ * @var \Da\User\Module $module
*/
$this->title = Yii::t('usuario', 'Roles');
@@ -24,7 +25,7 @@ $this->params['breadcrumbs'][] = $this->title;
?>
-beginContent('@Da/User/resources/views/shared/admin_layout.php') ?>
+beginContent($module->viewPath . '/shared/admin_layout.php') ?>
= GridView::widget(
[
diff --git a/src/User/resources/views/role/update.php b/src/User/resources/views/role/update.php
index b809f3b..b5121c9 100644
--- a/src/User/resources/views/role/update.php
+++ b/src/User/resources/views/role/update.php
@@ -13,13 +13,14 @@
* @var yii\web\View $this
* @var \Da\User\Model\Role $model
* @var string[] $unassignedItems
+ * @var \Da\User\Module $module
*/
$this->title = Yii::t('usuario', 'Update role');
$this->params['breadcrumbs'][] = $this->title;
?>
-beginContent('@Da/User/resources/views/shared/admin_layout.php') ?>
+beginContent($module->viewPath . '/shared/admin_layout.php') ?>
= $this->render(
'/role/_form',
diff --git a/src/User/resources/views/rule/create.php b/src/User/resources/views/rule/create.php
index 3bb4a5e..a03f96c 100644
--- a/src/User/resources/views/rule/create.php
+++ b/src/User/resources/views/rule/create.php
@@ -13,13 +13,14 @@
* @var yii\web\View $this
* @var \Da\User\Model\Rule $model
* @var string[] $unassignedItems
+ * @var \Da\User\Module $module
*/
$this->title = Yii::t('usuario', 'Create new rule');
$this->params['breadcrumbs'][] = $this->title;
?>
-beginContent('@Da/User/resources/views/shared/admin_layout.php') ?>
+beginContent($module->viewPath . '/shared/admin_layout.php') ?>
= $this->render(
'/rule/_form',
diff --git a/src/User/resources/views/rule/index.php b/src/User/resources/views/rule/index.php
index b725b7e..b2fd066 100644
--- a/src/User/resources/views/rule/index.php
+++ b/src/User/resources/views/rule/index.php
@@ -9,6 +9,7 @@ use yii\rbac\Rule;
* @var \yii\data\ActiveDataProvider $dataProvider
* @var \Da\User\Search\RuleSearch $searchModel
* @var yii\web\View $this
+ * @var \Da\User\Module $module
*/
$this->title = Yii::t('usuario', 'Rules');
@@ -16,7 +17,7 @@ $this->params['breadcrumbs'][] = $this->title;
?>
-beginContent('@Da/User/resources/views/shared/admin_layout.php') ?>
+beginContent($module->viewPath . '/shared/admin_layout.php') ?>
= GridView::widget(
[
diff --git a/src/User/resources/views/rule/update.php b/src/User/resources/views/rule/update.php
index 49f65cb..53e086a 100644
--- a/src/User/resources/views/rule/update.php
+++ b/src/User/resources/views/rule/update.php
@@ -13,14 +13,16 @@
* @var yii\web\View $this
* @var \Da\User\Model\Rule $model
* @var string[] $unassignedItems
+ * @var \Da\User\Module $module
*/
+
$this->title = Yii::t('usuario', 'Update rule');
$this->params['breadcrumbs'][] = ['label' => Yii::t('usuario', 'Rules'), 'url' => ['index']];
$this->params['breadcrumbs'][] = $this->title;
?>
-beginContent('@Da/User/resources/views/shared/admin_layout.php') ?>
+beginContent($module->viewPath . '/shared/admin_layout.php') ?>
= $this->render(
'/rule/_form',