diff --git a/app/Http/Controllers/Admin/MailTemplateController.php b/app/Http/Controllers/Admin/MailTemplateController.php index 6323dff..bad801f 100644 --- a/app/Http/Controllers/Admin/MailTemplateController.php +++ b/app/Http/Controllers/Admin/MailTemplateController.php @@ -11,15 +11,46 @@ class MailTemplateController extends Controller /** * 一覧表示 */ - public function list(Request $request) + public function list(Request $request) { if ($request->input('action') === 'reset') { return redirect()->route('mail_templates'); } + // 許可されたソートカラム一覧 + $allowedSorts = [ + 'mail_template_id', + 'pg_id', + 'internal_id', + 'mgr_cc_flag', + 'bcc_adrs', + 'use_flag', + 'memo', + 'subject', + 'text', + 'created_at', + 'updated_at', + 'operator_id', + ]; + + $sort = $request->input('sort', 'mail_template_id'); $sort_type = $request->input('sort_type', 'desc'); + $allowedSorts = [ + 'mail_template_id', 'pg_id', 'internal_id', 'mgr_cc_flag', + 'bcc_adrs', 'use_flag', 'memo', 'subject', 'text', + 'created_at', 'updated_at', 'operator_id' + ]; + + if (!in_array($sort, $allowedSorts)) { + $sort = 'mail_template_id'; + } + + if (!in_array($sort_type, ['asc', 'desc'])) { + $sort_type = 'desc'; +} + $query = MailTemplate::query(); // 絞り込み @@ -46,6 +77,7 @@ class MailTemplateController extends Controller )); } + /** * 新規登録 */ diff --git a/app/Http/Controllers/Admin/OperatorQueController.php b/app/Http/Controllers/Admin/OperatorQueController.php index 36daf1c..c192e4f 100644 --- a/app/Http/Controllers/Admin/OperatorQueController.php +++ b/app/Http/Controllers/Admin/OperatorQueController.php @@ -24,20 +24,31 @@ class OperatorQueController extends Controller $sort = $request->input('sort', 'que_id'); $sort_type = $request->input('sort_type', 'desc'); + // 許可されたカラム名のリスト(DB定義に合わせて) + $allowedSorts = ['que_id', 'ope_id', 'que_status', 'created_at', 'updated_at']; + + if (!in_array($sort, $allowedSorts)) { + $sort = 'que_id'; + } + + if (!in_array($sort_type, ['asc', 'desc'])) { + $sort_type = 'desc'; + } + $query = OperatorQue::query(); + // フィルタリング(絞り込み) if ($request->filled('que_status')) { $query->where('que_status', $request->input('que_status')); } $list = $query->orderBy($sort, $sort_type) - ->paginate(\App\Utils::item_per_page ?? 20); - - $que_status = $request->input('que_status'); + ->paginate(\App\Utils::item_per_page ?? 20); return view('admin.operator_ques.list', compact('list', 'sort', 'sort_type')); } + /** * 新規登録(画面/処理) */ diff --git a/app/Http/Controllers/Admin/SettingController.php b/app/Http/Controllers/Admin/SettingController.php index 454f128..e650576 100644 --- a/app/Http/Controllers/Admin/SettingController.php +++ b/app/Http/Controllers/Admin/SettingController.php @@ -16,15 +16,31 @@ class SettingController extends Controller public function list(Request $request) { $perPage = \App\Utils::item_per_page ?? 20; - $list = Setting::orderBy('setting_id', 'desc')->paginate($perPage); + + // リクエストから取得 + $sort = $request->input('sort', 'setting_id'); + $sort_type = $request->input('sort_type', 'desc'); + + // 許可されたカラムのみソート(安全対策) + $allowedSorts = ['setting_id', 'setting_key', 'setting_value']; // ← 必要に応じて増やす + + if (!in_array($sort, $allowedSorts)) { + $sort = 'setting_id'; + } + if (!in_array($sort_type, ['asc', 'desc'])) { + $sort_type = 'desc'; + } + + $list = Setting::orderBy($sort, $sort_type)->paginate($perPage); return view('admin.settings.list', [ 'list' => $list, - 'sort' => 'setting_id', - 'sort_type' => 'desc', + 'sort' => $sort, + 'sort_type' => $sort_type, ]); } + /** * 追加(GET: 画面 / POST: 登録): /settings/add */ diff --git a/resources/views/admin/devices/_form.blade.php b/resources/views/admin/devices/_form.blade.php index eddf819..b5d29fe 100644 --- a/resources/views/admin/devices/_form.blade.php +++ b/resources/views/admin/devices/_form.blade.php @@ -18,16 +18,7 @@ @endif -{{-- ===== ボタン区(上部) ===== --}} -
| - + | {{ __('デバイスID') }} | @@ -92,15 +92,16 @@{{ __('備考') }} | |
|---|---|---|---|
|
-
-
- {{ __('編集') }}
-
+ |
+
+
+ {{ __('編集') }}
+
|
+
{{ $item->device_id }} |
{{ $item->park_id }}
diff --git a/resources/views/admin/mail_templates/_form.blade.php b/resources/views/admin/mail_templates/_form.blade.php
index fac1efc..224c8d8 100644
--- a/resources/views/admin/mail_templates/_form.blade.php
+++ b/resources/views/admin/mail_templates/_form.blade.php
@@ -11,14 +11,6 @@
@endif
-
@@ -134,11 +126,15 @@
-
新規+新規登録
-
-
+
メール送信テンプレート編集+ + +
+
-
+
+
+
+
+ 編集+
+
+
+
diff --git a/resources/views/admin/mail_templates/list.blade.php b/resources/views/admin/mail_templates/list.blade.php
index b960b50..13201f3 100644
--- a/resources/views/admin/mail_templates/list.blade.php
+++ b/resources/views/admin/mail_templates/list.blade.php
@@ -11,7 +11,7 @@
|