webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-28 17:02:04 +03:00
Code Activity

#47 - Adds various translations in English, and a few code improvements.

Browse Source
This commit is contained in:
Abijeet
2017-06-06 01:46:59 +05:30
parent 7c6fe8c4e2
commit 5bd9da6054
8 changed files with 79 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/Http/Controllers/CommentController.php
View File

@ -5,7 +5,6 @@ use BookStack\Repos\EntityRepo;
use BookStack\Comment;
use Illuminate\Http\Request;
// delete -checkOwnablePermission \
class CommentController extends Controller
{
protected $entityRepo;
@ -68,12 +67,12 @@ class CommentController extends Controller
$comment = $this->comment->findOrFail($id);
$this->checkOwnablePermission('comment-delete', $comment);
$this->commentRepo->delete($comment);
$comment = $this->commentRepo->getCommentById($comment->id);
$updatedComment = $this->commentRepo->getCommentById($comment->id);
return response()->json([
'success' => true,
'status' => 'success',
'message' => trans('entities.comment_deleted'),
'comment' => $comment
'comment' => $updatedComment
]);
}
@ -85,18 +84,10 @@ class CommentController extends Controller
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);
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'),