TypeScript: Updated compile target, addressed issues

[bookstack] / app / Entities / Tools / PermissionsUpdater.php

diff --git a/app/Entities/Tools/PermissionsUpdater.php b/app/Entities/Tools/PermissionsUpdater.php
index 0d1d307afe9187d03afc44a6a7c3f8a7849c65a6..9f3b8f952777d8c1e9658f96fd2f5c65acb6eb95 100644 (file)
--- a/app/Entities/Tools/PermissionsUpdater.php
+++ b/app/Entities/Tools/PermissionsUpdater.php
@@ -2,14 +2,14 @@
 
 namespace BookStack\Entities\Tools;
 
 
 namespace BookStack\Entities\Tools;
 

-use BookStack\Actions\ActivityType;
-use BookStack\Auth\Permissions\EntityPermission;
-use BookStack\Auth\Role;
-use BookStack\Auth\User;
+use BookStack\Activity\ActivityType;

 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Bookshelf;
 use BookStack\Entities\Models\Entity;
 use BookStack\Facades\Activity;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Bookshelf;
 use BookStack\Entities\Models\Entity;
 use BookStack\Facades\Activity;

+use BookStack\Permissions\Models\EntityPermission;
+use BookStack\Users\Models\Role;
+use BookStack\Users\Models\User;

 use Illuminate\Http\Request;
 
 class PermissionsUpdater
 use Illuminate\Http\Request;
 
 class PermissionsUpdater


@@ -44,20 +44,20 @@ class PermissionsUpdater
      */
     public function updateFromApiRequestData(Entity $entity, array $data): void
     {
      */
     public function updateFromApiRequestData(Entity $entity, array $data): void
     {

-        if (isset($data['override_role_permissions'])) {
+        if (isset($data['role_permissions'])) {

             $entity->permissions()->where('role_id', '!=', 0)->delete();
             $entity->permissions()->where('role_id', '!=', 0)->delete();

-            $rolePermissionData = $this->formatPermissionsFromApiRequestToEntityPermissions($data['override_role_permissions'] ?? [], false);
+            $rolePermissionData = $this->formatPermissionsFromApiRequestToEntityPermissions($data['role_permissions'] ?? [], false);

             $entity->permissions()->createMany($rolePermissionData);
         }
 
             $entity->permissions()->createMany($rolePermissionData);
         }
 

-        if (array_key_exists('override_fallback_permissions', $data)) {
+        if (array_key_exists('fallback_permissions', $data)) {

             $entity->permissions()->where('role_id', '=', 0)->delete();
         }
 
             $entity->permissions()->where('role_id', '=', 0)->delete();
         }
 

-        if (isset($data['override_fallback_permissions'])) {
-            $data = $data['override_fallback_permissions'];
-            $data['role_id'] = 0;
-            $rolePermissionData = $this->formatPermissionsFromApiRequestToEntityPermissions([$data], true);
+        if (isset($data['fallback_permissions']['inheriting']) && $data['fallback_permissions']['inheriting'] !== true) {
+            $fallbackData = $data['fallback_permissions'];
+            $fallbackData['role_id'] = 0;
+            $rolePermissionData = $this->formatPermissionsFromApiRequestToEntityPermissions([$fallbackData], true);

             $entity->permissions()->createMany($rolePermissionData);
         }
 
             $entity->permissions()->createMany($rolePermissionData);
         }