浏览代码

Update CollectionController

Daniel Supernault 6 年之前
父节点
当前提交
8e033b3228
共有 1 个文件被更改,包括 6 次插入2 次删除
  1. 6 2
      app/Http/Controllers/CollectionController.php

+ 6 - 2
app/Http/Controllers/CollectionController.php

@@ -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)