обновил политику публикации новосте
This commit is contained in:
parent
fb85879ab6
commit
b9967776cd
@ -55,11 +55,11 @@ public function store(Request $request)
|
|||||||
foreach ($request->cities as $cityId) {
|
foreach ($request->cities as $cityId) {
|
||||||
$city = City::find($cityId);
|
$city = City::find($cityId);
|
||||||
if (auth()->user()->cannot('manage', $city)) {
|
if (auth()->user()->cannot('manage', $city)) {
|
||||||
return back();
|
return back()->withErrors(['cities' => 'У вас нет прав на публикацию для города ' . $city->name]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} elseif (!auth()->user()->isAdmin()) {
|
||||||
return back();
|
return back()->withErrors(['cities' => 'Выберите хотя бы один город для публикации']);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$path = $request->file('imageFile')->store('posts', ['disk' => 'public']);
|
$path = $request->file('imageFile')->store('posts', ['disk' => 'public']);
|
||||||
@ -110,11 +110,13 @@ public function update(Request $request, Post $post)
|
|||||||
foreach ($request->cities as $cityId) {
|
foreach ($request->cities as $cityId) {
|
||||||
$city = City::find($cityId);
|
$city = City::find($cityId);
|
||||||
if (auth()->user()->cannot('manage', $city)) {
|
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 {
|
} else {
|
||||||
return back();
|
return back()->withErrors(['cities' => 'Выберите хотя бы один город для публикации']);
|
||||||
}
|
}
|
||||||
|
|
||||||
$post = $post->update(
|
$post = $post->update(
|
||||||
|
|||||||
@ -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();
|
$citiesOfManager = \Modules\CityManager\Models\CityManager::where('user_id', $user->id)->pluck('city_id')->toArray();
|
||||||
if ($postCities = $post->cities->pluck('id')->toArray()) {
|
if ($postCities = $post->cities->pluck('id')->toArray()) {
|
||||||
if (array_intersect($postCities, $citiesOfManager)) {
|
if (!array_diff($postCities, $citiesOfManager)) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user