UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-10 00:34:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update CollectionController

Browse source
This commit is contained in:
Daniel Supernault 2019-08-01 22:34:39 -06:00
parent e01ece173c
commit 8e033b3228
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/Http/Controllers/CollectionController.php
View file

@ -34,7 +34,7 @@ class CollectionController extends Controller
public function show(Request $request, int $collection) public function show(Request $request, int $collection)
{ {
$collection = Collection::whereNotNull('published_at')->findOrFail($collection); $collection = Collection::with('profile')->whereNotNull('published_at')->findOrFail($collection);
if($collection->profile->status != null) { if($collection->profile->status != null) {
abort(404); abort(404);
} }
@ -100,7 +100,11 @@ class CollectionController extends Controller
$collection->items()->delete(); $collection->items()->delete();
$collection->delete(); $collection->delete();
return 200; if($request->wantsJson()) {
return 200;
}
return redirect('/');
} }
public function storeId(Request $request) public function storeId(Request $request)