Completed
Pull Request — develop (#1)
by Elizaveta
06:07
created
modules/mailTemplate/models/MailTemplate.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@
 block discarded – undo
49 49
     {
50 50
         return [
51 51
             [['body'], 'string'],
52
-            [['name',], 'required'],
52
+            [['name', ], 'required'],
53 53
             [['updated_at'], 'safe'],
54 54
         ];
55 55
     }
Please login to merge, or discard this patch.
modules/mailTemplate/models/SearchMailTemplate.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@
 block discarded – undo
19 19
         return [
20 20
             [['id'], 'integer'],
21 21
             [['key', 'name'], 'string', 'max' => 255],
22
-            [['updated_at',], 'safe'],
22
+            [['updated_at', ], 'safe'],
23 23
         ];
24 24
     }
25 25
 
Please login to merge, or discard this patch.
modules/feedback/controllers/ManagementController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@
 block discarded – undo
39 39
                         'actions' => ['create'],
40 40
                         'allow' => true,
41 41
                         'roles' => ['@'],
42
-                        'matchCallback' => function () {
42
+                        'matchCallback' => function() {
43 43
                             return !Yii::$app->user->can(User::ROLE_ADMIN);
44 44
                         },
45 45
                     ],
Please login to merge, or discard this patch.
modules/feedback/views/management/index.php 1 patch
Spacing   +5 added lines, -6 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
             'email:email',
31 31
             [
32 32
                 'attribute' => 'message',
33
-                'value' => function ($model) {
33
+                'value' => function($model) {
34 34
                     return StringHelper::truncate($model->message, 150);
35 35
                 },
36 36
             ],
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
                     ],
47 47
                     ['prompt' => Yii::t('feedback', 'All'), 'class' => 'form-control']
48 48
                 ),
49
-                'content' => function ($model) {
49
+                'content' => function($model) {
50 50
                     $label = Feedback::STATUS_ANSWERED === $model->status ? 'success' : 'danger';
51 51
                     return "<span class='visible-md-block visible-xs-block
52 52
                         visible-sm-block visible-lg-block label label-{$label}'>{$model->status}</span>";
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
                     'clientOptions' => ['format' => 'yyyy-mm-d']
71 71
                 ]),
72 72
                 'format' => 'html',
73
-                'content' => function ($model) {
73
+                'content' => function($model) {
74 74
                     return Yii::$app->formatter->asDatetime($model->updated_at);
75 75
                 },
76 76
             ],
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
                 'contentOptions' => ['style' => 'text-align: center'],
82 82
                 'template' => '{view} {answered} ',
83 83
                 'buttons' => [
84
-                    'answered' => function ($url, $model) {
84
+                    'answered' => function($url, $model) {
85 85
                         return Feedback::STATUS_NEW === $model->status ?
86 86
                             Html::beginForm(
87 87
                                 ['/feedback/management/update?id=' . $model->id],
@@ -97,8 +97,7 @@  discard block
 block discarded – undo
97 97
                                     'data' => ['method' => 'post'],
98 98
                                 ]
99 99
                             )
100
-                            . Html::endForm() :
101
-                            Html::a(
100
+                            . Html::endForm() : Html::a(
102 101
                                 '<span class="glyphicon glyphicon-comment text-muted"></span>',
103 102
                                 '#',
104 103
                                 ['title' => Yii::t('feedback', 'Answered')]
Please login to merge, or discard this patch.
modules/feedback/views/management/create.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@
 block discarded – undo
29 29
             <?= $form->field($model, 'message')->textarea(['rows' => 6]) ?>
30 30
 
31 31
 
32
-            <?= $form->field($model, 'verifyCode')->widget(Captcha::className(), [ 'captchaAction' => '/site/captcha',
32
+            <?= $form->field($model, 'verifyCode')->widget(Captcha::className(), ['captchaAction' => '/site/captcha',
33 33
                 'template' => '<div class="row"><div class="col-lg-3">{image}</div><div class="col-lg-6">{input}</div></div>',
34 34
             ]) ?>
35 35
 
Please login to merge, or discard this patch.
modules/option/views/management/index.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
                     'clientOptions' => ['format' => 'yyyy-mm-d']
35 35
                 ]),
36 36
                 'format' => 'html',
37
-                'content' => function ($model) {
37
+                'content' => function($model) {
38 38
                     return Yii::$app->formatter->asDatetime($model->created_at);
39 39
                 },
40 40
             ],
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
                     'clientOptions' => ['format' => 'yyyy-mm-d']
48 48
                 ]),
49 49
                 'format' => 'html',
50
-                'content' => function ($model) {
50
+                'content' => function($model) {
51 51
                     return Yii::$app->formatter->asDatetime($model->updated_at);
52 52
                 },
53 53
             ],
Please login to merge, or discard this patch.
modules/option/views/management/_form.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@
 block discarded – undo
17 17
 
18 18
 
19 19
     <div class="form-group">
20
-        <?= Html::submitButton(Yii::t('option', 'Update'), ['class' => 'btn btn-success' ]) ?>
20
+        <?= Html::submitButton(Yii::t('option', 'Update'), ['class' => 'btn btn-success']) ?>
21 21
         <?= Html::a(Yii::t('option', 'Cancel'), ['index'], ['class' => 'btn btn-default']); ?>
22 22
     </div>
23 23
 
Please login to merge, or discard this patch.
modules/user/views/management/index.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
             [
24 24
                 'label' => Yii::t('user', 'Avatar'),
25 25
                 'format' => 'raw',
26
-                'value' => function ($model) {
26
+                'value' => function($model) {
27 27
                     return Html::img($model->avatar, [
28 28
                         'alt' => Yii::t('user', 'Avatar'),
29 29
                         'style' => 'width:60px; object-fit:cover;',
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
             [
44 44
                 'attribute' => 'status',
45 45
                 'headerOptions' => ['width' => '120'],
46
-                'content' => function ($model) {
46
+                'content' => function($model) {
47 47
                     $label = User::STATUS_ACTIVE === $model->status ? 'success' : 'default';
48 48
                     $label = User::STATUS_BLOCKED === $model->status ? 'danger' : $label;
49 49
                     return "<span class='visible-md-block visible-xs-block
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
                     'clientOptions' => ['format' => 'yyyy-mm-d']
70 70
                 ]),
71 71
                 'format' => 'html',
72
-                'content' => function ($model) {
72
+                'content' => function($model) {
73 73
                     return Yii::$app->formatter->asDatetime($model->created_at);
74 74
                 },
75 75
             ],
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
                     'clientOptions' => ['format' => 'yyyy-mm-d']
83 83
                 ]),
84 84
                 'format' => 'html',
85
-                'content' => function ($model) {
85
+                'content' => function($model) {
86 86
                     return Yii::$app->formatter->asDatetime($model->last_login_at);
87 87
                 },
88 88
             ],
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
                 'class' => yii\grid\DataColumn::className(),
91 91
                 'label' => \Yii::t('user', 'Role'),
92 92
                 'attribute' => 'authAssignments.item_name',
93
-                'value' => function ($model) {
93
+                'value' => function($model) {
94 94
                     return $model->getRoleName() ?: 'no role';
95 95
                 },
96 96
             ],
Please login to merge, or discard this patch.
modules/user/views/management/view.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@
 block discarded – undo
17 17
     <h1><?= Html::encode($model->first_name); ?></h1>
18 18
     <div class="form-group">
19 19
         <?= Html::img(
20
-            $model->avatar ? : User::DEFAULT_AVATAR_URL,
20
+            $model->avatar ?: User::DEFAULT_AVATAR_URL,
21 21
             ['alt' => 'User avatar', 'width' => 200, 'height' => 200, 'class' => 'avatar-border']
22 22
         ) ?>
23 23
     </div>
Please login to merge, or discard this patch.