Fixed error causing permissions to be deleted on book sort

Closes #282
BookStackApp · Jan 23, 2017 · 492e2f1 · 492e2f1
1 parent 380f0f2
commit 492e2f1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/app/Http/Controllers/BookController.php b/app/Http/Controllers/BookController.php
@@ -208,7 +208,7 @@ public function saveSort($bookSlug, Request $request)
         }
 
         // Update permissions on changed models
-        $this->entityRepo->buildJointPermissions($updatedModels);
+        if (count($updatedModels) === 0) $this->entityRepo->buildJointPermissions($updatedModels);
 
         return redirect($book->getUrl());
     }

diff --git a/app/Services/PermissionService.php b/app/Services/PermissionService.php
@@ -243,13 +243,14 @@ public function deleteJointPermissionsForEntity(Entity $entity)
      */
     protected function deleteManyJointPermissionsForEntities($entities)
     {
+        if (count($entities) === 0) return;
         $query = $this->jointPermission->newQuery();
-        foreach ($entities as $entity) {
-            $query->orWhere(function($query) use ($entity) {
-                $query->where('entity_id', '=', $entity->id)
-                    ->where('entity_type', '=', $entity->getMorphClass());
-            });
-        }
+            foreach ($entities as $entity) {
+                $query->orWhere(function($query) use ($entity) {
+                    $query->where('entity_id', '=', $entity->id)
+                        ->where('entity_type', '=', $entity->getMorphClass());
+                });
+            }
         $query->delete();
     }