X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/2a2cc858f0f95c606f2ad2542f915d3bd761775f..refs/pull/1695/head:/app/Http/Controllers/ChapterController.php

diff --git a/app/Http/Controllers/ChapterController.php b/app/Http/Controllers/ChapterController.php
index a4a1dbf24..f728d1313 100644
--- a/app/Http/Controllers/ChapterController.php
+++ b/app/Http/Controllers/ChapterController.php
@@ -3,7 +3,6 @@
 use Activity;
 use BookStack\Auth\UserRepo;
 use BookStack\Entities\Repos\EntityRepo;
-use BookStack\Entities\ExportService;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Views;
@@ -113,7 +112,7 @@ class ChapterController extends Controller
         $chapter = $this->entityRepo->getEntityBySlug('chapter', $chapterSlug, $bookSlug);
         $this->checkOwnablePermission('chapter-update', $chapter);
 
-        $this->entityRepo->updateFromInput('chapter', $chapter, $request->all());
+        $this->entityRepo->updateFromInput($chapter, $request->all());
         Activity::add($chapter, 'chapter_update', $chapter->book->id);
         return redirect($chapter->getUrl());
     }
@@ -143,7 +142,7 @@ class ChapterController extends Controller
         $chapter = $this->entityRepo->getEntityBySlug('chapter', $chapterSlug, $bookSlug);
         $book = $chapter->book;
         $this->checkOwnablePermission('chapter-delete', $chapter);
-        Activity::addMessage('chapter_delete', $book->id, $chapter->name);
+        Activity::addMessage('chapter_delete', $chapter->name, $book->id);
         $this->entityRepo->destroyChapter($chapter);
         return redirect($book->getUrl());
     }
@@ -201,7 +200,9 @@ class ChapterController extends Controller
             return redirect()->back();
         }
 
-        $this->entityRepo->changeBook('chapter', $parent->id, $chapter, true);
+        $this->entityRepo->changeBook($chapter, $parent->id);
+        $chapter->rebuildPermissions();
+
         Activity::add($chapter, 'chapter_move', $chapter->book->id);
         $this->showSuccessNotification( trans('entities.chapter_move_success', ['bookName' => $parent->name]));