Completed
Push — master ( 4d2979...b140c1 )
by Xu
340:14 queued 300:11
created
src/user/models/User.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -50,13 +50,13 @@  discard block
 block discarded – undo
50 50
     const AFTER_REGISTER = 'afterRegister';
51 51
 
52 52
     //场景定义
53
-    const SCENARIO_CREATE = 'create';//后台或控制台创建用户
54
-    const SCENARIO_UPDATE = 'update';//后台或控制台修改用户
55
-    const SCENARIO_REGISTER = 'basic_create';//邮箱注册
56
-    const SCENARIO_EMAIL_REGISTER = 'email_create';//邮箱注册
57
-    const SCENARIO_MOBILE_REGISTER = 'mobile_create';//手机号注册
58
-    const SCENARIO_SETTINGS = 'settings';//更新
59
-    const SCENARIO_CONNECT = 'connect';//账户链接或自动注册新用户
53
+    const SCENARIO_CREATE = 'create'; //后台或控制台创建用户
54
+    const SCENARIO_UPDATE = 'update'; //后台或控制台修改用户
55
+    const SCENARIO_REGISTER = 'basic_create'; //邮箱注册
56
+    const SCENARIO_EMAIL_REGISTER = 'email_create'; //邮箱注册
57
+    const SCENARIO_MOBILE_REGISTER = 'mobile_create'; //手机号注册
58
+    const SCENARIO_SETTINGS = 'settings'; //更新
59
+    const SCENARIO_CONNECT = 'connect'; //账户链接或自动注册新用户
60 60
     const SCENARIO_PASSWORD = 'password';
61 61
 
62 62
     //头像
@@ -102,8 +102,8 @@  discard block
 block discarded – undo
102 102
             static::SCENARIO_EMAIL_REGISTER => ['nickname', 'email', 'password'],
103 103
             static::SCENARIO_MOBILE_REGISTER => ['mobile', 'password'],
104 104
             static::SCENARIO_SETTINGS => ['username', 'email', 'password'],
105
-            static::SCENARIO_CONNECT => ['nickname', 'email', 'password'],//链接账户密码可以为空邮箱可以为空
106
-            static::SCENARIO_PASSWORD => ['password'],//只修改密码
105
+            static::SCENARIO_CONNECT => ['nickname', 'email', 'password'], //链接账户密码可以为空邮箱可以为空
106
+            static::SCENARIO_PASSWORD => ['password'], //只修改密码
107 107
         ]);
108 108
     }
109 109
 
Please login to merge, or discard this patch.
src/oauth2/views/client/view.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -49,8 +49,8 @@
 block discarded – undo
49 49
                         'redirect_uri',
50 50
                         [
51 51
                             'label' => Yii::t('yuncms', 'Grant type'),
52
-                            'value' => function ($model) {
53
-                                if(empty($model->grant_type)){
52
+                            'value' => function($model) {
53
+                                if (empty($model->grant_type)) {
54 54
                                     return Yii::t('yuncms', 'All Type');
55 55
                                 }
56 56
                                 return $model->grant_type;
Please login to merge, or discard this patch.
src/oauth2/views/client/index.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
                     'columns' => [
30 30
                         [
31 31
                             'label' => Yii::t('yuncms', 'App Name'),
32
-                            'value' => function ($model) {
32
+                            'value' => function($model) {
33 33
                                 return Html::a(Html::encode($model->name), ['/oauth2/client/view', 'id' => $model->client_id]);
34 34
                             },
35 35
                             'format' => 'html'
Please login to merge, or discard this patch.