]> BookStack Code Mirror - bookstack/commitdiff
Merge branch 'prev-next-button' of https://github.com/shubhamosmosys/BookStack into...
authorDan Brown <redacted>
Wed, 26 May 2021 21:13:19 +0000 (22:13 +0100)
committerDan Brown <redacted>
Wed, 26 May 2021 21:13:19 +0000 (22:13 +0100)
1  2 
app/Entities/Models/Page.php
app/Entities/Repos/PageRepo.php
app/Http/Controllers/PageController.php
resources/sass/_layout.scss
resources/views/pages/show.blade.php

Simple merge
Simple merge
index 134c22081382bdd0a3a407b469bd7684ccb9c4d0,2bfd55fa0cf07b1797a22d31060773d6e34ec758..616970a5d05758088d04e2ec034c46dda3766913
@@@ -142,7 -142,39 +142,40 @@@ class PageController extends Controlle
              $page->load(['comments.createdBy']);
          }
  
 -        Views::add($page);
+         $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";
+         }
++        
 +        View::incrementFor($page);
          $this->setPageTitle($page->getShortName());
          return view('pages.show', [
              'page' => $page,
Simple merge
Simple merge