Merge pull request #15 from okazy/umebius/admin/login_history

管理画面ログイン履歴機能の微調整をしました
nanasess · Mar 23, 2021 · d6597c8 · d6597c8
2 parents c3c7123 + 17438a7
commit d6597c8
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 18 deletions.
diff --git a/app/DoctrineMigrations/Version20210319122142.php b/app/DoctrineMigrations/Version20210319122142.php
@@ -28,8 +28,8 @@ public function up(Schema $schema): void
     {
         $lang = env('ECCUBE_LOCALE');
         $statuses = [
-            LoginHistoryStatus::FAILURE => $lang === 'ja' ? '失敗' : 'Failure',
-            LoginHistoryStatus::SUCCESS => $lang === 'ja' ? '成功' : 'Success',
+            LoginHistoryStatus::FAILURE => $lang === 'en' ? 'Failure' : '失敗',
+            LoginHistoryStatus::SUCCESS => $lang === 'en' ? 'Success' : '成功',
         ];
 
         $sortNo = $this->connection->fetchColumn('SELECT MAX(sort_no) + 1 FROM mtb_login_history_status');

diff --git a/src/Eccube/Controller/Admin/Setting/System/LoginHistoryController.php b/src/Eccube/Controller/Admin/Setting/System/LoginHistoryController.php
@@ -18,7 +18,7 @@
 use Eccube\Repository\LoginHistoryRepository;
 use Eccube\Repository\Master\PageMaxRepository;
 use Eccube\Util\FormUtil;
-use Knp\Component\Pager\Paginator;
+use Knp\Component\Pager\PaginatorInterface;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
@@ -61,7 +61,7 @@ public function __construct(
      *
      * @return \Symfony\Component\HttpFoundation\Response|array
      */
-    public function index(Request $request, Paginator $paginator, $page_no = null)
+    public function index(Request $request, PaginatorInterface $paginator, $page_no = null)
     {
         $session = $request->getSession();
         $pageNo = $page_no;
@@ -85,7 +85,7 @@ public function index(Request $request, Paginator $paginator, $page_no = null)
 
         if ('POST' === $request->getMethod()) {
             $searchForm->handleRequest($request);
-            if ($searchForm->isValid()) {
+            if ($searchForm->isSubmitted() && $searchForm->isValid()) {
                 $searchData = $searchForm->getData();
                 $pageNo = 1;
                 $session->set('eccube.admin.login_history.search', FormUtil::getViewData($searchForm));

diff --git a/src/Eccube/Entity/LoginHistory.php b/src/Eccube/Entity/LoginHistory.php
@@ -39,13 +39,13 @@ class LoginHistory extends AbstractEntity
 
         /**
          * @var string
-         * @ORM\Column( type="text",nullable=true)
+         * @ORM\Column(type="text",nullable=true)
          */
         private $user_name;
 
         /**
          * @var string
-         * @ORM\Column( type="text",nullable=true)
+         * @ORM\Column(type="text",nullable=true)
          */
         private $client_ip;
 
@@ -115,14 +115,6 @@ public function getUserName()
             return $this->user_name;
         }
 
-        /**
-         * @return LoginHistoryStatus
-         */
-        public function getStatus()
-        {
-            return $this->Status;
-        }
-
         /**
          * @param LoginHistoryStatus $Status
          *
@@ -135,6 +127,14 @@ public function setStatus($Status)
             return $this;
         }
 
+        /**
+         * @return LoginHistoryStatus
+         */
+        public function getStatus()
+        {
+            return $this->Status;
+        }
+
         /**
          * Set client_ip
          *

diff --git a/src/Eccube/Entity/Master/LoginHistoryStatus.php b/src/Eccube/Entity/Master/LoginHistoryStatus.php
@@ -17,7 +17,7 @@
 
 if (!class_exists(LoginHistoryStatus::class, false)) {
     /**
-     * Work
+     * LoginHistoryStatus
      *
      * @ORM\Table(name="mtb_login_history_status")
      * @ORM\InheritanceType("SINGLE_TABLE")

diff --git a/src/Eccube/Form/Type/Admin/SearchLoginHistoryType.php b/src/Eccube/Form/Type/Admin/SearchLoginHistoryType.php
@@ -54,10 +54,16 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ->add('user_name', TextType::class, [
                 'label' => 'admin.setting.system.login_history.user_name',
                 'required' => false,
+                'constraints' => [
+                    new Assert\Length(['max' => $this->eccubeConfig['eccube_stext_len']]),
+                ],
             ])
             ->add('client_ip', TextType::class, [
                 'label' => 'admin.setting.system.login_history.client_ip',
                 'required' => false,
+                'constraints' => [
+                    new Assert\Length(['max' => $this->eccubeConfig['eccube_stext_len']]),
+                ],
             ])
             ->add('Status', LoginHistoryStatusType::class, [
                 'label' => 'admin.setting.system.login_history.status',

diff --git a/src/Eccube/Resource/locale/messages.en.yaml b/src/Eccube/Resource/locale/messages.en.yaml
@@ -1245,7 +1245,7 @@ admin.setting.system.security__card_title: Security Settings
 admin.setting.system.security.admin_url: Admin Console URL
 admin.setting.system.security.admin_url_description: It is recommended to set the URL which would NOT be easily guessed.
 admin.setting.system.security.admin_url_changed: The URL of Admin Console has been changed. Please sign in again.
-admin.setting.system.security.ip_limit: IP Restrictions
+admin.setting.system.security.ip_limit: IP Restrictions(Allow List)
 admin.setting.system.security.ip_limit_description: |
  This will restrict the access to the Admin Console to specified IP addresses.
  Please enter the URLs one by one which you allow the access to. If no URLs are entered, any URL can access your Admin Console.

diff --git a/src/Eccube/Resource/locale/messages.ja.yaml b/src/Eccube/Resource/locale/messages.ja.yaml
@@ -1245,7 +1245,7 @@ admin.setting.system.security__card_title: セキュリティ設定
 admin.setting.system.security.admin_url: 管理画面URL
 admin.setting.system.security.admin_url_description: 推測されにくいURLを設定することを推奨します。
 admin.setting.system.security.admin_url_changed: 管理画面のURLを変更しました。再度ログインを行ってください。
-admin.setting.system.security.ip_limit: IP制限
+admin.setting.system.security.ip_limit: IP制限(許可リスト)
 admin.setting.system.security.ip_limit_description: |
   管理機能へのアクセスを特定のIPアドレスからの接続のみに制限します。
   アクセスを許可するIPアドレスを1行ずつ入力してください。何も入力しない場合は全てを許可します。