Added translation string for tasklist WYSIWYG action

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

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

 
 

-use Activity;
-use BookStack\Actions\ActivityType;

 use BookStack\Actions\CommentRepo;
 use BookStack\Entities\Models\Page;
 use Illuminate\Http\Request;
 use BookStack\Actions\CommentRepo;
 use BookStack\Entities\Models\Page;
 use Illuminate\Http\Request;


@@ -17,14 +17,15 @@ class CommentController extends Controller
     }
 
     /**
     }
 
     /**

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

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

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

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


@@ -40,17 +41,19 @@ class CommentController extends Controller
         // Create a new comment.
         $this->checkPermission('comment-create-all');
         $comment = $this->commentRepo->create($page, $request->get('text'), $request->get('parent_id'));
         // Create a new comment.
         $this->checkPermission('comment-create-all');
         $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',
+            'text' => ['required', 'string'],

         ]);
 
         $comment = $this->commentRepo->getById($commentId);
         ]);
 
         $comment = $this->commentRepo->getById($commentId);


@@ -58,6 +61,7 @@ class CommentController extends Controller
         $this->checkOwnablePermission('comment-update', $comment);
 
         $comment = $this->commentRepo->update($comment, $request->get('text'));
         $this->checkOwnablePermission('comment-update', $comment);
 
         $comment = $this->commentRepo->update($comment, $request->get('text'));

+

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


@@ -70,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')]);
     }
 }