github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-06-04 00:44:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

#47 - Adds comment level permissions to the front-end.

Browse Source
This commit is contained in:
Abijeet
2017-06-04 11:17:14 +05:30
parent 6ff440e677
commit 2fd421b115
7 changed files with 41 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,6 +88,13 @@ class CommentController extends Controller
$this->checkOwnablePermission('page-view', $page);
$comments = $this->commentRepo->getPageComments($pageId);
return response()->json(['success' => true, 'comments'=> $comments['comments'], 'total' => $comments['total']]);
return response()->json(['success' => true, 'comments'=> $comments['comments'],
'total' => $comments['total'], 'permissions' => [
'comment_create' => $this->currentUser->can('comment-create-all'),
'comment_update_own' => $this->currentUser->can('comment-update-own'),
'comment_update_all' => $this->currentUser->can('comment-update-all'),
'comment_delete_all' => $this->currentUser->can('comment-delete-all'),
'comment_delete_own' => $this->currentUser->can('comment-delete-own'),
], 'user_id' => $this->currentUser->id]);
}
}

9
app/Http/Controllers/PageController.php
View File

@ -161,7 +161,7 @@ class PageController extends Controller
$pageContent = $this->entityRepo->renderPage($page);
$sidebarTree = $this->entityRepo->getBookChildren($page->book);
$pageNav = $this->entityRepo->getPageNav($pageContent);
Views::add($page);
$this->setPageTitle($page->getShortName());
return view('pages/show', [
@ -376,7 +376,7 @@ class PageController extends Controller
$page->fill($revision->toArray());
$this->setPageTitle(trans('entities.pages_revision_named', ['pageName' => $page->getShortName()]));
return view('pages/revision', [
'page' => $page,
'book' => $page->book,
@ -590,9 +590,4 @@ class PageController extends Controller
return redirect($page->getUrl());
}
public function getLastXComments($pageId)
{
// $this->checkOwnablePermission('page-view', $page);
}
}