diff --git a/database/seeds/DummyContentSeeder.php b/database/seeds/DummyContentSeeder.php index 7640e004a..d18eb30db 100644 --- a/database/seeds/DummyContentSeeder.php +++ b/database/seeds/DummyContentSeeder.php @@ -15,13 +15,13 @@ class DummyContentSeeder extends Seeder $role = \BookStack\Role::getRole('editor'); $user->attachRole($role); - factory(\BookStack\Book::class, 20)->create(['created_by' => $user->id, 'updated_by' => $user->id]) ->each(function($book) use ($user) { - $chapters = factory(\BookStack\Chapter::class, 5)->create(['created_by' => $user->id, 'updated_by' => $user->id])->each(function($chapter) use ($user, $book) { - $pages = factory(\BookStack\Page::class, 5)->create(['created_by' => $user->id, 'updated_by' => $user->id, 'book_id' => $book->id]); - $chapter->pages()->saveMany($pages); - }); + $chapters = factory(\BookStack\Chapter::class, 5)->create(['created_by' => $user->id, 'updated_by' => $user->id]) + ->each(function($chapter) use ($user, $book){ + $pages = factory(\BookStack\Page::class, 5)->make(['created_by' => $user->id, 'updated_by' => $user->id, 'book_id' => $book->id]); + $chapter->pages()->saveMany($pages); + }); $pages = factory(\BookStack\Page::class, 3)->make(['created_by' => $user->id, 'updated_by' => $user->id]); $book->chapters()->saveMany($chapters); $book->pages()->saveMany($pages); @@ -32,7 +32,6 @@ class DummyContentSeeder extends Seeder $chapters = factory(\BookStack\Chapter::class, 50)->make(['created_by' => $user->id, 'updated_by' => $user->id]); $largeBook->pages()->saveMany($pages); $largeBook->chapters()->saveMany($chapters); - app(\BookStack\Services\PermissionService::class)->buildJointPermissions(); app(\BookStack\Services\SearchService::class)->indexAllEntities(); } diff --git a/resources/assets/js/global.js b/resources/assets/js/global.js index b02f6caf3..7126479c1 100644 --- a/resources/assets/js/global.js +++ b/resources/assets/js/global.js @@ -93,7 +93,8 @@ Controllers(ngApp, window.$events); */ window.scrollToElement = function(element) { if (!element) return; - let top = element.getBoundingClientRect().top + document.body.scrollTop; + let offset = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop; + let top = element.getBoundingClientRect().top + offset; $('html, body').animate({ scrollTop: top - 60 // Adjust to change final scroll position top margin }, 300);