Merge pull request #2127 from opensource-workshop/2.25.1

Merge v1.25.1 into 2

Author: akagane99

app/Enums/PageCvsIndex.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Enums;
+
+use App\Enums\EnumsBase;
+
+/**
+ * ページ-CSVのインデックス
+ *
+ * @author 牟田口 満 <mutaguchi@opensource-workshop.jp>
+ * @copyright OpenSource-WorkShop Co.,Ltd. All Rights Reserved
+ * @category ページ管理
+ * @package Enums
+ */
+final class PageCvsIndex extends EnumsBase
+{
+    // 定数メンバ
+    const page_name = 0;
+    const permanent_link = 1;
+    const background_color = 2;
+    const header_color = 3;
+    const theme = 4;
+    const layout = 5;
+    const base_display_flag = 6;
+
+    /** key/valueの連想配列 */
+    const enum = [
+        self::page_name => 'page_name',
+        self::permanent_link => 'permanent_link',
+        self::background_color => 'background_color',
+        self::header_color => 'header_color',
+        self::theme => 'theme',
+        self::layout => 'layout',
+        self::base_display_flag => 'base_display_flag',
+    ];
+}

app/Enums/UserStatus.php

@@ -10,10 +10,15 @@
 final class UserStatus extends EnumsBase
 {
     // 定数メンバ
+    /** 利用可能 */
     const active = 0;
+    /** 利用不可 */
     const not_active = 1;
+    /** 仮削除 */
     const temporary_delete = 3;
+    /** 仮登録 */
     const temporary = 2;
+    /** 承認待ち */
     const pending_approval = 4;
 
     // key/valueの連想配列
@@ -31,9 +36,9 @@ final class UserStatus extends EnumsBase
     public static function getChooseableKeys()
     {
         $enum = self::enum;
-        // 仮登録は外す
+        // 仮登録, 承認待ちは外す
         unset($enum[self::temporary]);
-        // dd($enum);
+        unset($enum[self::pending_approval]);
 
         return array_keys($enum);
     }

app/Models/Migration/Nc2/Nc2RssBlock.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Models\Migration\Nc2;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Nc2RssBlock extends Model
+{
+    /**
+     * 使用するDB Connection
+     */
+    protected $connection = 'nc2';
+
+    /**
+     * テーブル名の指定
+     */
+    protected $table = 'rss_block';
+}

app/Plugins/Manage/LogManage/LogManage.php

@@ -46,11 +46,26 @@ private function getQuery($request)
         // ログデータ取得
         $app_logs_query = AppLog::select('app_logs.*');
 
+        // 日時Start
+        if (session()->has('app_log_search_condition.start_created_at')) {
+            $app_logs_query->where('created_at', '>=', session()->get('app_log_search_condition.start_created_at'));
+        }
+
+        // 日時End
+        if (session()->has('app_log_search_condition.end_created_at')) {
+            $app_logs_query->where('created_at', '<=', session()->get('app_log_search_condition.end_created_at'));
+        }
+
         // ログインID
         if ($request->session()->has('app_log_search_condition.userid')) {
             $app_logs_query->where('userid', 'like', '%' . $request->session()->get('app_log_search_condition.userid') . '%');
         }
 
+        // URI
+        if ($request->session()->has('app_log_search_condition.uri')) {
+            $app_logs_query->where('uri', 'like', '%' . $request->session()->get('app_log_search_condition.uri') . '%');
+        }
+
         // 詳細条件
         $app_logs_query->where(function ($query) use ($request) {
             // ログイン