From 2c4317f8f259a0f72661eec059565fe21dfd377f Mon Sep 17 00:00:00 2001 From: Sam Georges Date: Wed, 8 Oct 2014 18:54:45 +1100 Subject: [PATCH] Allow API to override login Attribute --- modules/backend/controllers/Users.php | 6 +++--- modules/backend/models/User.php | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/backend/controllers/Users.php b/modules/backend/controllers/Users.php index 9c7cdd0c2..5db153b3d 100644 --- a/modules/backend/controllers/Users.php +++ b/modules/backend/controllers/Users.php @@ -84,9 +84,9 @@ class Users extends Controller /** * Add available permission fields to the User form. */ - protected function formExtendFields($host) + protected function formExtendFields($form) { - if ($host->getContext() == 'myaccount') + if ($form->getContext() == 'myaccount') return; $permissionFields = []; @@ -116,6 +116,6 @@ class Users extends Controller $permissionFields[$fieldName] = $fieldConfig; } - $host->addTabFields($permissionFields); + $form->addTabFields($permissionFields); } } \ No newline at end of file diff --git a/modules/backend/models/User.php b/modules/backend/models/User.php index e4fa9c687..30af0514f 100644 --- a/modules/backend/models/User.php +++ b/modules/backend/models/User.php @@ -43,7 +43,10 @@ class User extends UserBase */ protected $purgeable = ['password_confirmation', 'send_invite']; - protected static $loginAttribute = 'login'; + /** + * @var string Login attribute + */ + public static $loginAttribute = 'login'; /** * @return string Returns the user's full name.