From cbafcb04b782b210d7d18f3bf3989652dd670132 Mon Sep 17 00:00:00 2001 From: gakigaki Date: Mon, 25 May 2026 17:25:20 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix(searchs):=20=E5=AF=BE=E8=B1=A1=E3=83=95?= =?UTF-8?q?=E3=83=AC=E3=83=BC=E3=83=A0=E6=AC=84=E3=82=92=E9=81=B8=E6=8A=9E?= =?UTF-8?q?=E6=99=82=E3=81=AE=E3=81=BF=E8=A1=A8=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../default/searchs_edit_search.blade.php | 74 +++++++++++++++++-- 1 file changed, 68 insertions(+), 6 deletions(-) diff --git a/resources/views/plugins/user/searchs/default/searchs_edit_search.blade.php b/resources/views/plugins/user/searchs/default/searchs_edit_search.blade.php index 245001bb4..483161794 100644 --- a/resources/views/plugins/user/searchs/default/searchs_edit_search.blade.php +++ b/resources/views/plugins/user/searchs/default/searchs_edit_search.blade.php @@ -46,7 +46,7 @@ @if (isset($searchs)) @if (!$searchs->id && !$create_flag) @else -
+ {{ csrf_field() }} {{-- create_flag がtrue の場合、新規作成するためにsearchs_id を空にする --}} @@ -167,15 +167,42 @@ + @php + $selected_frame_select = old('frame_select', $searchs->frame_select); + @endphp +
@foreach (SearchsFrameSelect::enum as $key => $item)
- @if(old('frame_select', $searchs->frame_select) == $key) - + @if($selected_frame_select == $key) + @else - + @endif
@@ -193,9 +220,9 @@
-
+
-
+
    @foreach(SearchsTargetPlugin::getPluginsCanSpecifiedFrames() as $target_plugin => $target_plugin_full)
  • @@ -275,4 +302,39 @@ @endif @endif @endif + + @endsection From 941fa3e0b4609eb09cb3ab1c61138168834c47f9 Mon Sep 17 00:00:00 2001 From: gakigaki Date: Tue, 26 May 2026 17:16:30 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix(searchs):=20=E5=AF=BE=E8=B1=A1=E3=83=95?= =?UTF-8?q?=E3=83=AC=E3=83=BC=E3=83=A0=E8=A8=AD=E5=AE=9A=E3=81=AE=E6=B6=88?= =?UTF-8?q?=E5=A4=B1=E3=82=92=E9=98=B2=E3=81=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Plugins/User/Searchs/SearchsPlugin.php | 7 +- .../default/searchs_edit_search.blade.php | 4 - .../SearchsTargetFrameSaveFeatureTest.php | 125 ++++++++++++++++++ 3 files changed, 131 insertions(+), 5 deletions(-) create mode 100644 tests/Feature/Plugins/User/Searchs/SearchsTargetFrameSaveFeatureTest.php diff --git a/app/Plugins/User/Searchs/SearchsPlugin.php b/app/Plugins/User/Searchs/SearchsPlugin.php index f4b2ae56f..a168a3960 100644 --- a/app/Plugins/User/Searchs/SearchsPlugin.php +++ b/app/Plugins/User/Searchs/SearchsPlugin.php @@ -420,6 +420,11 @@ public function saveBuckets($request, $page_id, $frame_id, $id = null) $message = '設定を変更しました。'; } + $target_frame_ids = $request->target_frame_ids; + if (intval($request->frame_select) == SearchsFrameSelect::all_frames && !$request->has('target_frame_ids')) { + $target_frame_ids = empty($searchs->target_frame_ids) ? [] : explode(',', $searchs->target_frame_ids); + } + // 設定データ $searchs->search_name = $request->search_name; $searchs->count = $request->count; @@ -427,7 +432,7 @@ public function saveBuckets($request, $page_id, $frame_id, $id = null) $searchs->view_posted_at = intval($request->view_posted_at); $searchs->target_plugins = implode(',', $request->target_plugin); $searchs->frame_select = intval($request->frame_select); - $searchs->target_frame_ids = empty($request->target_frame_ids) ? "": implode(',', $request->target_frame_ids); + $searchs->target_frame_ids = empty($target_frame_ids) ? "": implode(',', $target_frame_ids); $searchs->recieve_keyword = intval($request->recieve_keyword); $searchs->page_select = intval($request->page_select); diff --git a/resources/views/plugins/user/searchs/default/searchs_edit_search.blade.php b/resources/views/plugins/user/searchs/default/searchs_edit_search.blade.php index 483161794..d92d7cf48 100644 --- a/resources/views/plugins/user/searchs/default/searchs_edit_search.blade.php +++ b/resources/views/plugins/user/searchs/default/searchs_edit_search.blade.php @@ -320,10 +320,6 @@ class="custom-control-input" const disabled = checkedFrameSelect && checkedFrameSelect.value === allFramesValue; targetFramesArea.setAttribute('aria-disabled', disabled ? 'true' : 'false'); - - targetFramesArea.querySelectorAll('input[type="checkbox"]').forEach(function(checkbox) { - checkbox.disabled = disabled; - }); }; frameSelects.forEach(function(frameSelect) { diff --git a/tests/Feature/Plugins/User/Searchs/SearchsTargetFrameSaveFeatureTest.php b/tests/Feature/Plugins/User/Searchs/SearchsTargetFrameSaveFeatureTest.php new file mode 100644 index 000000000..cf2f99acd --- /dev/null +++ b/tests/Feature/Plugins/User/Searchs/SearchsTargetFrameSaveFeatureTest.php @@ -0,0 +1,125 @@ +seed(); + } + + /** + * 「全て表示する」で保存しても、画面上では使わない既存の対象フレーム指定を保持すること。 + */ + public function testSaveBucketsKeepsTargetFrameIdsWhenAllFramesRequestOmitsThem(): void + { + $admin = $this->createContentAdminUser(); + [$page, $frame] = $this->createPluginFrame('searchs'); + $searchs = $this->createSearchsBucket($frame->id, '10,20'); + + $response = $this->actingAs($admin)->post("/redirect/plugin/searchs/saveBuckets/{$page->id}/{$frame->id}", [ + 'redirect_path' => url("/plugin/searchs/editBuckets/{$page->id}/{$frame->id}#frame-{$frame->id}"), + 'searchs_id' => $searchs->id, + 'search_name' => 'サイト内検索を更新', + 'count' => 20, + 'view_posted_name' => 0, + 'view_posted_at' => 0, + 'target_plugin' => ['blogs' => 'blogs'], + 'frame_select' => SearchsFrameSelect::all_frames, + 'recieve_keyword' => 0, + 'page_select' => SearchsPageSelect::all_pages, + ]); + + $response->assertStatus(302); + $this->assertDatabaseHas('searchs', [ + 'id' => $searchs->id, + 'frame_select' => SearchsFrameSelect::all_frames, + 'target_frame_ids' => '10,20', + ]); + } + + /** + * 「選択したものだけ表示する」で保存した場合は、送信された対象フレーム指定へ更新すること。 + */ + public function testSaveBucketsUpdatesTargetFrameIdsWhenSelectedOnlySendsThem(): void + { + $admin = $this->createContentAdminUser(); + [$page, $frame] = $this->createPluginFrame('searchs'); + $searchs = $this->createSearchsBucket($frame->id, '10,20'); + + $response = $this->actingAs($admin)->post("/redirect/plugin/searchs/saveBuckets/{$page->id}/{$frame->id}", [ + 'redirect_path' => url("/plugin/searchs/editBuckets/{$page->id}/{$frame->id}#frame-{$frame->id}"), + 'searchs_id' => $searchs->id, + 'search_name' => 'サイト内検索を更新', + 'count' => 20, + 'view_posted_name' => 0, + 'view_posted_at' => 0, + 'target_plugin' => ['blogs' => 'blogs'], + 'frame_select' => SearchsFrameSelect::selected_only, + 'target_frame_ids' => [30 => 30], + 'recieve_keyword' => 0, + 'page_select' => SearchsPageSelect::all_pages, + ]); + + $response->assertStatus(302); + $this->assertDatabaseHas('searchs', [ + 'id' => $searchs->id, + 'frame_select' => SearchsFrameSelect::selected_only, + 'target_frame_ids' => '30', + ]); + } + + /** + * 既存バケツとサイト内検索設定を作成し、指定フレームに紐づける。 + */ + private function createSearchsBucket(int $frame_id, string $target_frame_ids): Searchs + { + $bucket = Buckets::factory()->create([ + 'bucket_name' => 'サイト内検索', + 'plugin_name' => 'searchs', + ]); + $this->assertDatabaseHas('frames', [ + 'id' => $frame_id, + ]); + + app('db')->table('frames') + ->where('id', $frame_id) + ->update(['bucket_id' => $bucket->id]); + + return Searchs::create([ + 'bucket_id' => $bucket->id, + 'search_name' => 'サイト内検索', + 'count' => 10, + 'view_posted_name' => 0, + 'view_posted_at' => 0, + 'target_plugins' => 'blogs', + 'frame_select' => SearchsFrameSelect::selected_only, + 'target_frame_ids' => $target_frame_ids, + 'recieve_keyword' => 0, + 'page_select' => SearchsPageSelect::all_pages, + ]); + } +}