@@ -3,10 +3,10 @@ |
||
3 | 3 | /* @var $this \yii\web\View */ |
4 | 4 | /* @var $content string */ |
5 | 5 | |
6 | -use yii\helpers\Html; |
|
7 | -use yii\helpers\Url; |
|
8 | 6 | use backend\assets\LoginAsset; |
9 | 7 | use common\widgets\Alert; |
8 | +use yii\helpers\Html; |
|
9 | +use yii\helpers\Url; |
|
10 | 10 | |
11 | 11 | LoginAsset::register($this); |
12 | 12 | ?> |
@@ -5,15 +5,15 @@ |
||
5 | 5 | |
6 | 6 | use backend\assets\AppAsset; |
7 | 7 | use backend\assets\plugins\iCheckAsset; |
8 | -use yii\helpers\Html; |
|
9 | -use yii\helpers\Url; |
|
10 | -use yii\widgets\Menu; |
|
11 | -use yii\widgets\Breadcrumbs; |
|
12 | 8 | use common\widgets\Alert; |
13 | -use modules\users\widgets\AvatarWidget; |
|
14 | 9 | use modules\main\Module as MainModule; |
15 | -use modules\users\Module as UserModule; |
|
16 | 10 | use modules\rbac\Module as RbacModule; |
11 | +use modules\users\Module as UserModule; |
|
12 | +use modules\users\widgets\AvatarWidget; |
|
13 | +use yii\helpers\Html; |
|
14 | +use yii\helpers\Url; |
|
15 | +use yii\widgets\Breadcrumbs; |
|
16 | +use yii\widgets\Menu; |
|
17 | 17 | |
18 | 18 | iCheckAsset::register($this); |
19 | 19 | AppAsset::register($this); |
@@ -2,8 +2,8 @@ |
||
2 | 2 | |
3 | 3 | namespace modules\rbac\components\behavior; |
4 | 4 | |
5 | -use Yii; |
|
6 | -use yii\base\Behavior; |
|
5 | +use Yii; |
|
6 | +use yii\base\Behavior; |
|
7 | 7 | use yii\console\Controller; |
8 | 8 | |
9 | 9 | /** |
@@ -71,7 +71,7 @@ |
||
71 | 71 | } |
72 | 72 | |
73 | 73 | /** |
74 | - * @param null $user_id |
|
74 | + * @param integer $user_id |
|
75 | 75 | * @return mixed|null |
76 | 76 | */ |
77 | 77 | public function getUserRoleValue($user_id = null) |
@@ -8,12 +8,12 @@ |
||
8 | 8 | |
9 | 9 | namespace modules\rbac\console; |
10 | 10 | |
11 | -use Yii; |
|
12 | -use yii\console\Controller; |
|
13 | -use yii\console\Exception; |
|
11 | +use Yii; |
|
12 | +use console\components\helpers\Console; |
|
13 | +use modules\users\models\User; |
|
14 | +use yii\console\Controller; |
|
15 | +use yii\console\Exception; |
|
14 | 16 | use yii\helpers\ArrayHelper; |
15 | -use modules\users\models\User; |
|
16 | -use console\components\helpers\Console; |
|
17 | 17 | |
18 | 18 | /** |
19 | 19 | * Class RolesController |
@@ -2,9 +2,9 @@ |
||
2 | 2 | |
3 | 3 | namespace modules\rbac\models; |
4 | 4 | |
5 | -use Yii; |
|
5 | +use Yii; |
|
6 | +use modules\rbac\Module; |
|
6 | 7 | use yii\base\Model; |
7 | -use modules\rbac\Module; |
|
8 | 8 | |
9 | 9 | /** |
10 | 10 | * Class Permission |
@@ -2,9 +2,9 @@ |
||
2 | 2 | |
3 | 3 | namespace modules\rbac\models; |
4 | 4 | |
5 | -use Yii; |
|
5 | +use Yii; |
|
6 | +use modules\rbac\Module; |
|
6 | 7 | use yii\base\Model; |
7 | -use modules\rbac\Module; |
|
8 | 8 | |
9 | 9 | /** |
10 | 10 | * Class Role |
@@ -2,9 +2,9 @@ |
||
2 | 2 | |
3 | 3 | /* @var $this yii\web\View */ |
4 | 4 | |
5 | +use modules\rbac\Module; |
|
5 | 6 | use yii\helpers\Html; |
6 | 7 | use yii\helpers\Url; |
7 | -use modules\rbac\Module; |
|
8 | 8 | |
9 | 9 | $this->title = Module::t('module', 'Role Based Access Control'); |
10 | 10 | $this->params['breadcrumbs'][] = Module::t('module', 'RBAC'); |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | |
76 | 76 | /** |
77 | 77 | * Lists all User models. |
78 | - * @return mixed |
|
78 | + * @return string |
|
79 | 79 | */ |
80 | 80 | public function actionIndex() |
81 | 81 | { |
@@ -269,7 +269,7 @@ discard block |
||
269 | 269 | * Deletes an existing User model. |
270 | 270 | * If deletion is successful, the browser will be redirected to the 'index' page. |
271 | 271 | * @param integer $id |
272 | - * @return mixed |
|
272 | + * @return \yii\web\Response |
|
273 | 273 | */ |
274 | 274 | public function actionDelete($id) |
275 | 275 | { |
@@ -340,7 +340,7 @@ discard block |
||
340 | 340 | /** |
341 | 341 | * Logout action. |
342 | 342 | * |
343 | - * @return string |
|
343 | + * @return \yii\web\Response |
|
344 | 344 | */ |
345 | 345 | public function actionLogout() |
346 | 346 | { |
@@ -2,16 +2,16 @@ |
||
2 | 2 | namespace modules\users\controllers\backend; |
3 | 3 | |
4 | 4 | use Yii; |
5 | +use modules\rbac\models\Assignment; |
|
6 | +use modules\rbac\models\Permission; |
|
7 | +use modules\users\Module; |
|
5 | 8 | use modules\users\models\LoginForm; |
6 | 9 | use modules\users\models\User; |
7 | 10 | use modules\users\models\search\UserSearch; |
11 | +use yii\filters\AccessControl; |
|
12 | +use yii\filters\VerbFilter; |
|
8 | 13 | use yii\web\Controller; |
9 | 14 | use yii\web\NotFoundHttpException; |
10 | -use yii\filters\VerbFilter; |
|
11 | -use yii\filters\AccessControl; |
|
12 | -use modules\rbac\models\Permission; |
|
13 | -use modules\rbac\models\Assignment; |
|
14 | -use modules\users\Module; |
|
15 | 15 | |
16 | 16 | /** |
17 | 17 | * Class DefaultController |
@@ -1,8 +1,8 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -use yii\helpers\Html; |
|
4 | -use yii\grid\GridView; |
|
5 | 3 | use modules\rbac\Module; |
4 | +use yii\grid\GridView; |
|
5 | +use yii\helpers\Html; |
|
6 | 6 | |
7 | 7 | /* @var $this yii\web\View */ |
8 | 8 | /* @var $dataProvider yii\data\ActiveDataProvider */ |