Merge pull request #3556 from GongMingCai/development

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

diff --git a/app/Http/Controllers/CommentController.php b/app/Http/Controllers/CommentController.php
index 068358d72d10af92de45327e0b207093c9c501fd..9804f6d39a0b077448a84a887b8563c6826a6047 100644 (file)
--- a/app/Http/Controllers/CommentController.php
+++ b/app/Http/Controllers/CommentController.php
@@ -1,8 +1,9 @@
-<?php namespace BookStack\Http\Controllers;
+<?php
+
+namespace BookStack\Http\Controllers;

 
 

-use Activity;

 use BookStack\Actions\CommentRepo;
 use BookStack\Actions\CommentRepo;

-use BookStack\Entities\Page;
+use BookStack\Entities\Models\Page;

 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 


@@ -10,24 +11,21 @@ class CommentController extends Controller
 {
     protected $commentRepo;
 
 {
     protected $commentRepo;
 

-    /**
-     * CommentController constructor.
-     */

     public function __construct(CommentRepo $commentRepo)
     {
         $this->commentRepo = $commentRepo;
     public function __construct(CommentRepo $commentRepo)
     {
         $this->commentRepo = $commentRepo;

-        parent::__construct();

     }
 
     /**
     }
 
     /**

-     * Save a new comment for a Page
+     * Save a new comment for a Page.
+     *

      * @throws ValidationException
      */
      * @throws ValidationException
      */

-    public function savePageComment(Request $request, int $pageId, int $commentId = null)
+    public function savePageComment(Request $request, int $pageId)

     {
         $this->validate($request, [
     {
         $this->validate($request, [

-            'text' => 'required|string',
-            'html' => 'required|string',
+            'text'      => ['required', 'string'],
+            'parent_id' => ['nullable', 'integer'],

         ]);
 
         $page = Page::visible()->find($pageId);
         ]);
 
         $page = Page::visible()->find($pageId);


@@ -35,8 +33,6 @@ class CommentController extends Controller
             return response('Not found', 404);
         }
 
             return response('Not found', 404);
         }
 

-        $this->checkOwnablePermission('page-view', $page);
-

         // Prevent adding comments to draft pages
         if ($page->draft) {
             return $this->jsonError(trans('errors.cannot_add_comment_to_draft'), 400);
         // Prevent adding comments to draft pages
         if ($page->draft) {
             return $this->jsonError(trans('errors.cannot_add_comment_to_draft'), 400);


@@ -44,27 +40,28 @@ class CommentController extends Controller
 
         // Create a new comment.
         $this->checkPermission('comment-create-all');
 
         // Create a new comment.
         $this->checkPermission('comment-create-all');

-        $comment = $this->commentRepo->create($page, $request->only(['html', 'text', 'parent_id']));
-        Activity::add($page, 'commented_on', $page->book->id);
+        $comment = $this->commentRepo->create($page, $request->get('text'), $request->get('parent_id'));
+

         return view('comments.comment', ['comment' => $comment]);
     }
 
     /**
      * Update an existing comment.
         return view('comments.comment', ['comment' => $comment]);
     }
 
     /**
      * Update an existing comment.

+     *

      * @throws ValidationException
      */
     public function update(Request $request, int $commentId)
     {
         $this->validate($request, [
      * @throws ValidationException
      */
     public function update(Request $request, int $commentId)
     {
         $this->validate($request, [

-            'text' => 'required|string',
-            'html' => 'required|string',
+            'text' => ['required', 'string'],

         ]);
 
         $comment = $this->commentRepo->getById($commentId);
         $this->checkOwnablePermission('page-view', $comment->entity);
         $this->checkOwnablePermission('comment-update', $comment);
 
         ]);
 
         $comment = $this->commentRepo->getById($commentId);
         $this->checkOwnablePermission('page-view', $comment->entity);
         $this->checkOwnablePermission('comment-update', $comment);
 

-        $comment = $this->commentRepo->update($comment, $request->only(['html', 'text']));
+        $comment = $this->commentRepo->update($comment, $request->get('text'));
+

         return view('comments.comment', ['comment' => $comment]);
     }
 
         return view('comments.comment', ['comment' => $comment]);
     }
 


@@ -77,6 +74,7 @@ class CommentController extends Controller
         $this->checkOwnablePermission('comment-delete', $comment);
 
         $this->commentRepo->delete($comment);
         $this->checkOwnablePermission('comment-delete', $comment);
 
         $this->commentRepo->delete($comment);

+

         return response()->json(['message' => trans('entities.comment_deleted')]);
     }
 }
         return response()->json(['message' => trans('entities.comment_deleted')]);
     }
 }