Removes some unused code.

[bookstack] / app / Http / Controllers / CommentController.php

diff --git a/app/Http/Controllers/CommentController.php b/app/Http/Controllers/CommentController.php
index 3a267193d5b155cd59e06798949ddc1a774a6d52..e8d5eab309a577fe1c4dbcd81a04a2fd96b4954f 100644 (file)
--- a/app/Http/Controllers/CommentController.php
+++ b/app/Http/Controllers/CommentController.php
@@ -5,7 +5,6 @@ use BookStack\Repos\EntityRepo;
 use BookStack\Comment;
 use Illuminate\Http\Request;
 
 use BookStack\Comment;
 use Illuminate\Http\Request;
 

-// delete  -checkOwnablePermission \

 class CommentController extends Controller
 {
     protected $entityRepo;
 class CommentController extends Controller
 {
     protected $entityRepo;


@@ -67,6 +66,14 @@ class CommentController extends Controller
     public function destroy($id) {
         $comment = $this->comment->findOrFail($id);
         $this->checkOwnablePermission('comment-delete', $comment);
     public function destroy($id) {
         $comment = $this->comment->findOrFail($id);
         $this->checkOwnablePermission('comment-delete', $comment);

+        $this->commentRepo->delete($comment);
+        $updatedComment = $this->commentRepo->getCommentById($comment->id);
+
+        return response()->json([
+            'status' => 'success',
+            'message' => trans('entities.comment_deleted'),
+            'comment' => $updatedComment
+        ]);

     }
 
 
     }
 
 


@@ -77,18 +84,10 @@ class CommentController extends Controller
             return response('Not found', 404);
         }
 
             return response('Not found', 404);
         }
 

-        if($page->draft) {
-            // cannot add comments to drafts.
-            return response()->json([
-                'status' => 'error',
-                'message' => trans('errors.no_comments_for_draft'),
-            ], 400);
-        }
-

         $this->checkOwnablePermission('page-view', $page);
 
         $comments = $this->commentRepo->getPageComments($pageId);
         $this->checkOwnablePermission('page-view', $page);
 
         $comments = $this->commentRepo->getPageComments($pageId);

-        return response()->json(['success' => true, 'comments'=> $comments['comments'],
+        return response()->json(['status' => 'success', 'comments'=> $comments['comments'],

             'total' => $comments['total'], 'permissions' => [
                 'comment_create' => $this->currentUser->can('comment-create-all'),
                 'comment_update_own' => $this->currentUser->can('comment-update-own'),
             'total' => $comments['total'], 'permissions' => [
                 'comment_create' => $this->currentUser->can('comment-create-all'),
                 'comment_update_own' => $this->currentUser->can('comment-update-own'),