Incremented version

Merge branch 'v0.16' into release
Fixed role permission removal bug
2026-02-21 11:19:38 +03:00 · 2017-06-04 15:38:49 +01:00 · 2017-06-04 15:38:29 +01:00 · 2017-06-04 15:37:10 +01:00 · 2017-05-07 19:35:51 +01:00 · 2017-05-07 19:35:34 +01:00
2 changed files with 3 additions and 3 deletions
--- a/app/Services/PermissionService.php
+++ b/app/Services/PermissionService.php
@@ -259,7 +259,7 @@ class PermissionService
        $roleIds = array_map(function($role) {
            return $role->id;
        }, $roles);
-        $this->jointPermission->newQuery()->whereIn('id', $roleIds)->delete();
+        $this->jointPermission->newQuery()->whereIn('role_id', $roleIds)->delete();
    }

    /**
@@ -399,7 +399,7 @@ class PermissionService
        $hasPermissiveAccessToParents = !$book->restricted;

        // For pages with a chapter, Check if explicit permissions are set on the Chapter
-        if ($entity->isA('page') && $entity->chapter_id !== 0) {
+        if ($entity->isA('page') && $entity->chapter_id !== 0 && $entity->chapter_id !== '0') {
            $chapter = $this->getChapter($entity->chapter_id);
            $hasPermissiveAccessToParents = $hasPermissiveAccessToParents && !$chapter->restricted;
            if ($chapter->restricted) {
--- a/2
+++ b/2
@@ -1 +1 @@
-v0.16.1
+v0.16.3
Author	SHA1	Message	Date
Dan Brown	3903fda6ca	Incremented version	2017-06-04 15:38:49 +01:00
Dan Brown	441e46ebaa	Merge branch 'v0.16' into release	2017-06-04 15:38:29 +01:00
Dan Brown	f99c8ff99a	Fixed role permission removal bug	2017-06-04 15:37:10 +01:00
Dan Brown	1f4260f359	Updated version for release v0.16.2	2017-05-07 19:35:51 +01:00
Dan Brown	dc0bf8ad4e	Merge branch 'master' into release	2017-05-07 19:35:34 +01:00
Dan Brown	75981c2412	Fixed chapter check for non-mysqlnd instances Fixes #383	2017-05-07 19:34:56 +01:00