From: Dan Brown Date: Wed, 26 May 2021 21:13:19 +0000 (+0100) Subject: Merge branch 'prev-next-button' of https://github.com/shubhamosmosys/BookStack into... X-Git-Tag: v21.05~1^2~10 X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/7ca66c5d5e7f691e27ac35b392770bb4d3a3b2fb Merge branch 'prev-next-button' of https://github.com/shubhamosmosys/BookStack into shubhamosmosys-prev-next-button --- 7ca66c5d5e7f691e27ac35b392770bb4d3a3b2fb diff --cc app/Http/Controllers/PageController.php index 134c22081,2bfd55fa0..616970a5d --- a/app/Http/Controllers/PageController.php +++ b/app/Http/Controllers/PageController.php @@@ -142,7 -142,39 +142,40 @@@ class PageController extends Controlle $page->load(['comments.createdBy']); } + $chapterId = $page->getParentChapter(); + $allPageSlugs = $this->pageRepo->getPageByChapterID($chapterId[0]->id); + $pos = 0; + foreach ($allPageSlugs as $slug){ + if($pageSlug === $slug->slug){ + $currPagePos = $pos; + } + $pos++; + $pageUrl = $this->pageRepo->getBySlug($bookSlug, $slug->slug); + $urlLink[] = $pageUrl->getUrl(); + } + for($i=0; $i <= $currPagePos; $i++){ + $nextCount = $i+1; + $prevCount = $i-1; + $prevPage = '#'; + $nextPage = '#'; + if($nextCount < count($urlLink)){ + $nextPage = $urlLink[$nextCount]; + } + if($currPagePos == $i && $currPagePos != 0){ + $prevPage = $urlLink[$prevCount]; + } + } + + $disablePrev = ""; + $disableNxt = ""; + if($prevPage == "#"){ + $disablePrev = "disabled"; + } + if($nextPage == "#"){ + $disableNxt = "disabled"; + } - Views::add($page); ++ + View::incrementFor($page); $this->setPageTitle($page->getShortName()); return view('pages.show', [ 'page' => $page,