@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | public function rules() |
| 23 | 23 | { |
| 24 | 24 | return [ |
| 25 | - [['id', 'status',], 'integer'], |
|
| 25 | + [['id', 'status', ], 'integer'], |
|
| 26 | 26 | [['username', 'email'], 'safe'], |
| 27 | 27 | ]; |
| 28 | 28 | } |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | public function search($params) |
| 38 | 38 | { |
| 39 | 39 | /* @var $query \yii\db\ActiveQuery */ |
| 40 | - $class = Yii::$app->getUser()->identityClass ? : 'mdm\admin\models\User'; |
|
| 40 | + $class = Yii::$app->getUser()->identityClass ?: 'mdm\admin\models\User'; |
|
| 41 | 41 | $query = $class::find(); |
| 42 | 42 | |
| 43 | 43 | $dataProvider = new ActiveDataProvider([ |
@@ -18,7 +18,7 @@ |
||
| 18 | 18 | */ |
| 19 | 19 | public function actionIndex($page = 'README.md') |
| 20 | 20 | { |
| 21 | - if (preg_match('/^docs\/images\/image\d+\.png$/',$page)) { |
|
| 21 | + if (preg_match('/^docs\/images\/image\d+\.png$/', $page)) { |
|
| 22 | 22 | $file = Yii::getAlias("@mdm/admin/{$page}"); |
| 23 | 23 | return Yii::$app->getResponse()->sendFile($file); |
| 24 | 24 | } |
@@ -10,7 +10,7 @@ discard block |
||
| 10 | 10 | $baseDir = ''; |
| 11 | 11 | $this->title = substr($page, 0, strrpos($page, '.')); |
| 12 | 12 | } else { |
| 13 | - $baseDir = substr($page, 0, $pos) . '/'; |
|
| 13 | + $baseDir = substr($page, 0, $pos).'/'; |
|
| 14 | 14 | $this->title = substr($page, $pos + 1, strrpos($page, '.') - $pos - 1); |
| 15 | 15 | } |
| 16 | 16 | |
@@ -22,10 +22,10 @@ discard block |
||
| 22 | 22 | $url = Url::to($menu['url'], true); |
| 23 | 23 | $links[] = "[**{$menu['label']}**]({$url})"; |
| 24 | 24 | } |
| 25 | - $body = str_replace(':smile:.', ".\n\n" . implode(' ', $links) . "\n", file_get_contents(Url::to('@mdm/admin/README.md'))); |
|
| 26 | -} elseif(preg_match('/^docs\/guide\/[\w-]+\.md$/', $page)) { |
|
| 25 | + $body = str_replace(':smile:.', ".\n\n".implode(' ', $links)."\n", file_get_contents(Url::to('@mdm/admin/README.md'))); |
|
| 26 | +} elseif (preg_match('/^docs\/guide\/[\w-]+\.md$/', $page)) { |
|
| 27 | 27 | $body = file_get_contents(Url::to("@mdm/admin/{$page}")); |
| 28 | -} else{ |
|
| 28 | +} else { |
|
| 29 | 29 | $body = ''; |
| 30 | 30 | } |
| 31 | 31 | |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | if ($link[0] == '/') { |
| 36 | 36 | $link = Url::current(['page' => ltrim($link, '/')], true); |
| 37 | 37 | } else { |
| 38 | - $link = Url::current(['page' => $baseDir . $link], true); |
|
| 38 | + $link = Url::current(['page' => $baseDir.$link], true); |
|
| 39 | 39 | } |
| 40 | 40 | } |
| 41 | 41 | return "]($link)"; |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | return [ |
| 67 | 67 | [['ruleName'], 'checkRule'], |
| 68 | 68 | [['name', 'type'], 'required'], |
| 69 | - [['name'], 'checkUnique', 'when' => function () { |
|
| 69 | + [['name'], 'checkUnique', 'when' => function() { |
|
| 70 | 70 | return $this->isNewRecord || ($this->_item->name != $this->name); |
| 71 | 71 | }], |
| 72 | 72 | [['type'], 'integer'], |
@@ -305,7 +305,7 @@ discard block |
||
| 305 | 305 | ->where([$idField => $provider->getModels()]) |
| 306 | 306 | ->asArray()->all(); |
| 307 | 307 | |
| 308 | - $route = '/' . $ctrl->uniqueId . '/view'; |
|
| 308 | + $route = '/'.$ctrl->uniqueId.'/view'; |
|
| 309 | 309 | foreach ($users as &$row) { |
| 310 | 310 | $row['link'] = Url::to([$route, 'id' => $row['id']]); |
| 311 | 311 | } |
@@ -83,14 +83,14 @@ |
||
| 83 | 83 | <div class="col-sm-1"> |
| 84 | 84 | <br><br> |
| 85 | 85 | <?= |
| 86 | - Html::a('>>' . $animateIcon, ['assign', 'id' => $model->name], [ |
|
| 86 | + Html::a('>>'.$animateIcon, ['assign', 'id' => $model->name], [ |
|
| 87 | 87 | 'class' => 'btn btn-success btn-assign', |
| 88 | 88 | 'data-target' => 'available', |
| 89 | 89 | 'title' => Yii::t('rbac-admin', 'Assign'), |
| 90 | 90 | ]); |
| 91 | 91 | ?><br><br> |
| 92 | 92 | <?= |
| 93 | - Html::a('<<' . $animateIcon, ['remove', 'id' => $model->name], [ |
|
| 93 | + Html::a('<<'.$animateIcon, ['remove', 'id' => $model->name], [ |
|
| 94 | 94 | 'class' => 'btn btn-danger btn-assign', |
| 95 | 95 | 'data-target' => 'assigned', |
| 96 | 96 | 'title' => Yii::t('rbac-admin', 'Remove'), |