Fixed error causing permissions to be deleted on book sort

Closes #282

diff --git a/app/Http/Controllers/BookController.php b/app/Http/Controllers/BookController.php
index 57ac486d5e71122b49b057b9fc7dc25dd36ef3ed..408192ff9085dadb68363c1c1eb821704572301c 100644 (file)
--- a/app/Http/Controllers/BookController.php
+++ b/app/Http/Controllers/BookController.php
@@ -208,7 +208,7 @@ class BookController extends Controller
         }
 
         // Update permissions on changed models
         }
 
         // Update permissions on changed models

-        $this->entityRepo->buildJointPermissions($updatedModels);
+        if (count($updatedModels) === 0) $this->entityRepo->buildJointPermissions($updatedModels);

 
         return redirect($book->getUrl());
     }
 
         return redirect($book->getUrl());
     }

diff --git a/app/Services/PermissionService.php b/app/Services/PermissionService.php
index 39a2c38beda24f795dbe4d0d0d88c3fec3a9f40f..72a810b6b4ebf657f6c29cd681141b930652a34c 100644 (file)
--- a/app/Services/PermissionService.php
+++ b/app/Services/PermissionService.php
@@ -243,13 +243,14 @@ class PermissionService
      */
     protected function deleteManyJointPermissionsForEntities($entities)
     {
      */
     protected function deleteManyJointPermissionsForEntities($entities)
     {

+        if (count($entities) === 0) return;

         $query = $this->jointPermission->newQuery();
         $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();
     }
 
         $query->delete();
     }