From 0196ecfda6ddbb70afe3cebbeee6531048a006b5 Mon Sep 17 00:00:00 2001 From: mnglkhn Date: Sat, 11 Jul 2015 10:23:45 -0500 Subject: [PATCH 01/10] Update Module.php --- Module.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Module.php b/Module.php index c458976..a7f62c1 100644 --- a/Module.php +++ b/Module.php @@ -31,7 +31,7 @@ class Module extends \yii\base\Module /** * @var bool If true, users are required to enter a username */ - public $requireUsername = false; + public $requireUsername = true; /** * @var bool If true, users can enter an email. This is automatically set to true if $requireEmail = true @@ -279,4 +279,4 @@ public function getActions() "/{$this->id}/confirm?key=zzzzz" => "Confirm email address. Automatically generated upon registration/email change", ]; } -} \ No newline at end of file +} From 5faca6955eebbfc3d1993a68b2f6f106af881416 Mon Sep 17 00:00:00 2001 From: mnglkhn Date: Sat, 11 Jul 2015 10:30:18 -0500 Subject: [PATCH 02/10] Update User.php --- models/User.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/models/User.php b/models/User.php index 0afcc9b..b884a15 100644 --- a/models/User.php +++ b/models/User.php @@ -198,7 +198,9 @@ public function getProfiles() */ public function getProfile() { - $profile = Yii::$app->getModule("user")->model("Profile"); + /** @var Module $userModule */ + $userModule = Yii::$app->getModule("user"); + $profile = $userModule->model("Profile"); return $this->hasOne($profile::className(), ['user_id' => 'id']); } @@ -207,7 +209,9 @@ public function getProfile() */ public function getRole() { - $role = Yii::$app->getModule("user")->model("Role"); + /** @var Module $userModule */ + $userModule = Yii::$app->getModule("user"); + $role = $userModule->model("Role"); return $this->hasOne($role::className(), ['id' => 'role_id']); } @@ -216,7 +220,9 @@ public function getRole() */ public function getUserKeys() { - $userKey = Yii::$app->getModule("user")->model("UserKey"); + /** @var Module $userModule */ + $userModule = Yii::$app->getModule("user"); + $userKey = $userModule->model("UserKey"); return $this->hasMany($userKey::className(), ['user_id' => 'id']); } @@ -529,4 +535,4 @@ public static function statusDropdown() return $dropdown; } -} \ No newline at end of file +} From 057946629755e4b10723cffe43f0a64f0f655fc1 Mon Sep 17 00:00:00 2001 From: mnglkhn Date: Sat, 11 Jul 2015 10:32:36 -0500 Subject: [PATCH 03/10] Update login.php --- views/default/login.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/default/login.php b/views/default/login.php index ee697bc..d4d3ef3 100644 --- a/views/default/login.php +++ b/views/default/login.php @@ -12,7 +12,7 @@ $this->title = Yii::t('user', 'Login'); $this->params['breadcrumbs'][] = $this->title; ?> -