From b9967776cd645120808c6cb49d8583b984eff65e Mon Sep 17 00:00:00 2001 From: developer Date: Fri, 8 May 2026 15:47:39 +0800 Subject: [PATCH] =?UTF-8?q?=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D0=B8=D1=82=D0=B8=D0=BA=D1=83=20=D0=BF=D1=83?= =?UTF-8?q?=D0=B1=D0=BB=D0=B8=D0=BA=D0=B0=D1=86=D0=B8=D0=B8=20=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=D0=BE=D1=81=D1=82=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Http/Controllers/AdminPostsController.php | 12 +++++++----- app/Modules/Post/Policies/PostPolicy.php | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/Modules/Admin/Http/Controllers/AdminPostsController.php b/app/Modules/Admin/Http/Controllers/AdminPostsController.php index 7c6be39..c4bc11f 100644 --- a/app/Modules/Admin/Http/Controllers/AdminPostsController.php +++ b/app/Modules/Admin/Http/Controllers/AdminPostsController.php @@ -55,11 +55,11 @@ public function store(Request $request) foreach ($request->cities as $cityId) { $city = City::find($cityId); if (auth()->user()->cannot('manage', $city)) { - return back(); + return back()->withErrors(['cities' => 'У вас нет прав на публикацию для города ' . $city->name]); } } - } else { - return back(); + } elseif (!auth()->user()->isAdmin()) { + return back()->withErrors(['cities' => 'Выберите хотя бы один город для публикации']); } } $path = $request->file('imageFile')->store('posts', ['disk' => 'public']); @@ -110,11 +110,13 @@ public function update(Request $request, Post $post) foreach ($request->cities as $cityId) { $city = City::find($cityId); if (auth()->user()->cannot('manage', $city)) { - return back(); + return back()->withErrors(['cities' => 'У вас нет прав на публикацию для города ' . $city->name]); } } + } elseif (auth()->user()->isAdmin()) { + PostCity::where('post_id', $post->id)->delete(); } else { - return back(); + return back()->withErrors(['cities' => 'Выберите хотя бы один город для публикации']); } $post = $post->update( diff --git a/app/Modules/Post/Policies/PostPolicy.php b/app/Modules/Post/Policies/PostPolicy.php index 25c4988..cc66be5 100644 --- a/app/Modules/Post/Policies/PostPolicy.php +++ b/app/Modules/Post/Policies/PostPolicy.php @@ -63,7 +63,7 @@ public function update(User $user, Post $post): bool { $citiesOfManager = \Modules\CityManager\Models\CityManager::where('user_id', $user->id)->pluck('city_id')->toArray(); if ($postCities = $post->cities->pluck('id')->toArray()) { - if (array_intersect($postCities, $citiesOfManager)) { + if (!array_diff($postCities, $citiesOfManager)) { return true; } }