use BookStack\Exceptions\NotFoundException;
use BookStack\Repos\UserRepo;
use BookStack\Services\ExportService;
+use Carbon\Carbon;
use Illuminate\Http\Request;
use BookStack\Http\Requests;
use BookStack\Repos\BookRepo;
public function create($bookSlug, $chapterSlug = false)
{
$book = $this->bookRepo->getBySlug($bookSlug);
- $chapter = $chapterSlug ? $this->chapterRepo->getBySlug($chapterSlug, $book->id) : false;
+ $chapter = $chapterSlug ? $this->chapterRepo->getBySlug($chapterSlug, $book->id) : null;
$parent = $chapter ? $chapter : $book;
$this->checkOwnablePermission('page-create', $parent);
$this->setPageTitle('Create New Page');
- return view('pages/create', ['book' => $book, 'chapter' => $chapter]);
+
+ $draft = $this->pageRepo->getDraftPage($book, $chapter);
+ return redirect($draft->getUrl());
+ }
+
+ /**
+ * Show form to continue editing a draft page.
+ * @param $bookSlug
+ * @param $pageId
+ * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+ */
+ public function editDraft($bookSlug, $pageId)
+ {
+ $book = $this->bookRepo->getBySlug($bookSlug);
+ $draft = $this->pageRepo->getById($pageId, true);
+ $this->checkOwnablePermission('page-create', $book);
+ $this->setPageTitle('Edit Page Draft');
+
+ return view('pages/edit', ['page' => $draft, 'book' => $book, 'isDraft' => true]);
}
/**
- * Store a newly created page in storage.
+ * Store a new page by changing a draft into a page.
* @param Request $request
- * @param $bookSlug
+ * @param string $bookSlug
* @return Response
*/
- public function store(Request $request, $bookSlug)
+ public function store(Request $request, $bookSlug, $pageId)
{
$this->validate($request, [
- 'name' => 'required|string|max:255'
+ 'name' => 'required|string|max:255'
]);
$input = $request->all();
$book = $this->bookRepo->getBySlug($bookSlug);
- $chapterId = ($request->has('chapter') && $this->chapterRepo->idExists($request->get('chapter'))) ? $request->get('chapter') : null;
- $parent = $chapterId !== null ? $this->chapterRepo->getById($chapterId) : $book;
+
+ $draftPage = $this->pageRepo->getById($pageId, true);
+
+ $chapterId = intval($draftPage->chapter_id);
+ $parent = $chapterId !== 0 ? $this->chapterRepo->getById($chapterId) : $book;
$this->checkOwnablePermission('page-create', $parent);
- $input['priority'] = $this->bookRepo->getNewPriority($book);
- $page = $this->pageRepo->saveNew($input, $book, $chapterId);
+ if ($parent->isA('chapter')) {
+ $input['priority'] = $this->chapterRepo->getNewPriority($parent);
+ } else {
+ $input['priority'] = $this->bookRepo->getNewPriority($parent);
+ }
+
+ $page = $this->pageRepo->publishDraft($draftPage, $input);
Activity::add($page, 'page_create', $book->id);
return redirect($page->getUrl());
return redirect($page->getUrl());
}
+ $this->checkOwnablePermission('page-view', $page);
+
$sidebarTree = $this->bookRepo->getChildren($book);
Views::add($page);
$this->setPageTitle($page->getShortName());
$this->setPageTitle('Editing Page ' . $page->getShortName());
$page->isDraft = false;
- // Check for active editing and drafts
+ // Check for active editing
$warnings = [];
if ($this->pageRepo->isPageEditingActive($page, 60)) {
$warnings[] = $this->pageRepo->getPageEditingActiveMessage($page, 60);
}
+ // Check for a current draft version for this user
if ($this->pageRepo->hasUserGotPageDraft($page, $this->currentUser->id)) {
$draft = $this->pageRepo->getUserPageDraft($page, $this->currentUser->id);
$page->name = $draft->name;
$page->html = $draft->html;
+ $page->markdown = $draft->markdown;
$page->isDraft = true;
$warnings [] = $this->pageRepo->getUserPageDraftMessage($draft);
}
public function update(Request $request, $bookSlug, $pageSlug)
{
$this->validate($request, [
- 'name' => 'required|string|max:255'
+ 'name' => 'required|string|max:255'
]);
$book = $this->bookRepo->getBySlug($bookSlug);
$page = $this->pageRepo->getBySlug($pageSlug, $book->id);
* @param $pageId
* @return \Illuminate\Http\JsonResponse
*/
- public function saveUpdateDraft(Request $request, $pageId)
+ public function saveDraft(Request $request, $pageId)
{
- $this->validate($request, [
- 'name' => 'required|string|max:255'
- ]);
- $page = $this->pageRepo->getById($pageId);
+ $page = $this->pageRepo->getById($pageId, true);
$this->checkOwnablePermission('page-update', $page);
- $draft = $this->pageRepo->saveUpdateDraft($page, $request->only(['name', 'html']));
- $updateTime = $draft->updated_at->format('H:i');
- return response()->json(['status' => 'success', 'message' => 'Draft saved at ' . $updateTime]);
+ if ($page->draft) {
+ $draft = $this->pageRepo->updateDraftPage($page, $request->only(['name', 'html', 'markdown']));
+ } else {
+ $draft = $this->pageRepo->saveUpdateDraft($page, $request->only(['name', 'html', 'markdown']));
+ }
+
+ $updateTime = $draft->updated_at->timestamp;
+ $utcUpdateTimestamp = $updateTime + Carbon::createFromTimestamp(0)->offset;
+ return response()->json([
+ 'status' => 'success',
+ 'message' => 'Draft saved at ',
+ 'timestamp' => $utcUpdateTimestamp
+ ]);
}
/**
return view('pages/delete', ['book' => $book, 'page' => $page, 'current' => $page]);
}
+
+ /**
+ * Show the deletion page for the specified page.
+ * @param $bookSlug
+ * @param $pageId
+ * @return \Illuminate\View\View
+ * @throws NotFoundException
+ */
+ public function showDeleteDraft($bookSlug, $pageId)
+ {
+ $book = $this->bookRepo->getBySlug($bookSlug);
+ $page = $this->pageRepo->getById($pageId, true);
+ $this->checkOwnablePermission('page-update', $page);
+ $this->setPageTitle('Delete Draft Page ' . $page->getShortName());
+ return view('pages/delete', ['book' => $book, 'page' => $page, 'current' => $page]);
+ }
+
/**
* Remove the specified page from storage.
- *
* @param $bookSlug
* @param $pageSlug
* @return Response
$page = $this->pageRepo->getBySlug($pageSlug, $book->id);
$this->checkOwnablePermission('page-delete', $page);
Activity::addMessage('page_delete', $book->id, $page->name);
+ session()->flash('success', 'Page deleted');
+ $this->pageRepo->destroy($page);
+ return redirect($book->getUrl());
+ }
+
+ /**
+ * Remove the specified draft page from storage.
+ * @param $bookSlug
+ * @param $pageId
+ * @return Response
+ * @throws NotFoundException
+ */
+ public function destroyDraft($bookSlug, $pageId)
+ {
+ $book = $this->bookRepo->getBySlug($bookSlug);
+ $page = $this->pageRepo->getById($pageId, true);
+ $this->checkOwnablePermission('page-update', $page);
+ session()->flash('success', 'Draft deleted');
$this->pageRepo->destroy($page);
return redirect($book->getUrl());
}
$page = $this->pageRepo->getBySlug($pageSlug, $book->id);
$pdfContent = $this->exportService->pageToPdf($page);
return response()->make($pdfContent, 200, [
- 'Content-Type' => 'application/octet-stream',
- 'Content-Disposition' => 'attachment; filename="'.$pageSlug.'.pdf'
+ 'Content-Type' => 'application/octet-stream',
+ 'Content-Disposition' => 'attachment; filename="' . $pageSlug . '.pdf'
]);
}
$page = $this->pageRepo->getBySlug($pageSlug, $book->id);
$containedHtml = $this->exportService->pageToContainedHtml($page);
return response()->make($containedHtml, 200, [
- 'Content-Type' => 'application/octet-stream',
- 'Content-Disposition' => 'attachment; filename="'.$pageSlug.'.html'
+ 'Content-Type' => 'application/octet-stream',
+ 'Content-Disposition' => 'attachment; filename="' . $pageSlug . '.html'
]);
}
$page = $this->pageRepo->getBySlug($pageSlug, $book->id);
$containedHtml = $this->exportService->pageToPlainText($page);
return response()->make($containedHtml, 200, [
- 'Content-Type' => 'application/octet-stream',
- 'Content-Disposition' => 'attachment; filename="'.$pageSlug.'.txt'
+ 'Content-Type' => 'application/octet-stream',
+ 'Content-Disposition' => 'attachment; filename="' . $pageSlug . '.txt'
]);
}
*/
public function showRecentlyCreated()
{
- $pages = $this->pageRepo->getRecentlyCreatedPaginated(20);
+ $pages = $this->pageRepo->getRecentlyCreatedPaginated(20)->setPath(baseUrl('/pages/recently-created'));
return view('pages/detailed-listing', [
'title' => 'Recently Created Pages',
'pages' => $pages
*/
public function showRecentlyUpdated()
{
- $pages = $this->pageRepo->getRecentlyUpdatedPaginated(20);
+ $pages = $this->pageRepo->getRecentlyUpdatedPaginated(20)->setPath(baseUrl('/pages/recently-updated'));
return view('pages/detailed-listing', [
'title' => 'Recently Updated Pages',
'pages' => $pages
$this->checkOwnablePermission('restrictions-manage', $page);
$roles = $this->userRepo->getRestrictableRoles();
return view('pages/restrictions', [
- 'page' => $page,
+ 'page' => $page,
'roles' => $roles
]);
}
/**
- * Set the restrictions for this page.
+ * Show the view to choose a new parent to move a page into.
+ * @param $bookSlug
+ * @param $pageSlug
+ * @return mixed
+ * @throws NotFoundException
+ */
+ public function showMove($bookSlug, $pageSlug)
+ {
+ $book = $this->bookRepo->getBySlug($bookSlug);
+ $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
+ $this->checkOwnablePermission('page-update', $page);
+ return view('pages/move', [
+ 'book' => $book,
+ 'page' => $page
+ ]);
+ }
+
+ /**
+ * Does the action of moving the location of a page
+ * @param $bookSlug
+ * @param $pageSlug
+ * @param Request $request
+ * @return mixed
+ * @throws NotFoundException
+ */
+ public function move($bookSlug, $pageSlug, Request $request)
+ {
+ $book = $this->bookRepo->getBySlug($bookSlug);
+ $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
+ $this->checkOwnablePermission('page-update', $page);
+
+ $entitySelection = $request->get('entity_selection', null);
+ if ($entitySelection === null || $entitySelection === '') {
+ return redirect($page->getUrl());
+ }
+
+ $stringExploded = explode(':', $entitySelection);
+ $entityType = $stringExploded[0];
+ $entityId = intval($stringExploded[1]);
+
+ $parent = false;
+
+ if ($entityType == 'chapter') {
+ $parent = $this->chapterRepo->getById($entityId);
+ } else if ($entityType == 'book') {
+ $parent = $this->bookRepo->getById($entityId);
+ }
+
+ if ($parent === false || $parent === null) {
+ session()->flash('The selected Book or Chapter was not found');
+ return redirect()->back();
+ }
+
+ $this->pageRepo->changePageParent($page, $parent);
+ Activity::add($page, 'page_move', $page->book->id);
+ session()->flash('success', sprintf('Page moved to "%s"', $parent->name));
+
+ return redirect($page->getUrl());
+ }
+
+ /**
+ * Set the permissions for this page.
* @param $bookSlug
* @param $pageSlug
* @param Request $request
$book = $this->bookRepo->getBySlug($bookSlug);
$page = $this->pageRepo->getBySlug($pageSlug, $book->id);
$this->checkOwnablePermission('restrictions-manage', $page);
- $this->pageRepo->updateRestrictionsFromRequest($request, $page);
- session()->flash('success', 'Page Restrictions Updated');
+ $this->pageRepo->updateEntityPermissionsFromRequest($request, $page);
+ session()->flash('success', 'Page Permissions Updated');
return redirect($page->getUrl());
}
projects / bookstack / blobdiff