Skip to content

Master merge #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
s-nakajima merged 3 commits into from
May 26, 2021
Merged

Master merge #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f5c67ef
change: 英語のUsernameのラベルをLogin IDに変更。
ryu818 Feb 24, 2021
95b564a
change: IEでログインしたときにアラートを表示する
s-nakajima May 24, 2021
51ae93c
Merge pull request #69 from NetCommons3/issues/1644
s-nakajima May 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Controller/AuthController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
* @property ForgotPass $ForgotPass
* @property NetCommonsComponent $NetCommons
* @property User $User
* @property DeprecatedBrowserComponent $DeprecatedBrowser
*
* @author Shohei Nakajima <nakajimashouhei@gmail.com>
* @package NetCommons\Auth\Controller
Expand All @@ -34,6 +35,7 @@ class AuthController extends AuthAppController {
*/
public $components = array(
'Security',
'NetCommons.DeprecatedBrowser',
);

/**
Expand Down Expand Up @@ -113,6 +115,11 @@ public function login() {
//$this->_setNc2Authenticate();

if ($this->Auth->login()) {
//非推奨ブラウザチェック
if ($this->DeprecatedBrowser->isDeprecatedBrowser()) {
$this->DeprecatedBrowser->setFlashNotification();
}

ClassRegistry::removeObject('User');
$this->User = ClassRegistry::init('Users.User');

Expand Down
4 changes: 2 additions & 2 deletions Locale/eng/LC_MESSAGES/auth.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,12 +124,12 @@ msgstr ""
#: Auth/View/Auth/login.ctp:50
#: Auth/View/ForgotPass/update.ctp:26
msgid "Username"
msgstr ""
msgstr "Login ID"

#: Auth/View/Auth/login.ctp:51
#: Auth/View/ForgotPass/update.ctp:27
msgid "Please enter your username."
msgstr ""
msgstr "Please enter your Login ID"

#: Auth/View/Auth/login.ctp:57
msgid "Password"
Expand Down