Merge branch 'release/6.0.13'

* release/6.0.13: fixes #880 fixes #879
austintoddj · Nov 1, 2020 · bda0d99 · bda0d99
2 parents a653ea6 + 7f71392
commit bda0d99
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/src/Http/Controllers/PostController.php b/src/Http/Controllers/PostController.php
@@ -87,19 +87,19 @@ public function store(StorePostRequest $request, $id): JsonResponse
     {
         $data = $request->validated();
 
-        if ($request->user('canvas')->isAdmin) {
-            $post = Post::with('tags', 'topic')->find($id);
-        } else {
-            $post = Post::with('tags', 'topic')->where('user_id', $request->user('canvas')->id)->find($id);
-        }
+        $post = Post::when($request->user('canvas')->isContributor, function ($query) {
+            return $query->where('user_id', request()->user('canvas')->id);
+        }, function ($query) {
+            return $query;
+        })->with('tags', 'topic')->find($id);
 
         if (! $post) {
             $post = new Post(['id' => $id]);
         }
 
         $post->fill($data);
 
-        $post->user_id = $request->user('canvas')->id;
+        $post->user_id = $post->user_id ?? request()->user('canvas')->id;
 
         $post->save();
 

diff --git a/src/Http/Controllers/TagController.php b/src/Http/Controllers/TagController.php
@@ -64,7 +64,7 @@ public function store(StoreTagRequest $request, $id): JsonResponse
 
         $tag->fill($data);
 
-        $tag->user_id = request()->user('canvas')->id;
+        $tag->user_id = $tag->user_id ?? request()->user('canvas')->id;
 
         $tag->save();
 

diff --git a/src/Http/Controllers/TopicController.php b/src/Http/Controllers/TopicController.php
@@ -50,25 +50,25 @@ public function store(StoreTopicRequest $request, $id): JsonResponse
     {
         $data = $request->validated();
 
-        $tag = Topic::find($id);
+        $topic = Topic::find($id);
 
-        if (! $tag) {
-            if ($tag = Topic::onlyTrashed()->firstWhere('slug', $data['slug'])) {
-                $tag->restore();
+        if (! $topic) {
+            if ($topic = Topic::onlyTrashed()->firstWhere('slug', $data['slug'])) {
+                $topic->restore();
 
-                return response()->json($tag->refresh(), 201);
+                return response()->json($topic->refresh(), 201);
             } else {
-                $tag = new Topic(['id' => $id]);
+                $topic = new Topic(['id' => $id]);
             }
         }
 
-        $tag->fill($data);
+        $topic->fill($data);
 
-        $tag->user_id = request()->user('canvas')->id;
+        $topic->user_id = $topic->user_id ?? request()->user('canvas')->id;
 
-        $tag->save();
+        $topic->save();
 
-        return response()->json($tag->refresh(), 201);
+        return response()->json($topic->refresh(), 201);
     }
 
     /**