directus#863 done

itsmerhp · Apr 28, 2019 · 9da9d2f · 9da9d2f
1 parent c788bee
commit 9da9d2f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 215 deletions.
diff --git a/src/core/Directus/Permissions/Acl.php b/src/core/Directus/Permissions/Acl.php
@@ -1245,11 +1245,26 @@ public function allowTo($action, $level, $collection, $status = null)
         if ($this->isAdmin()) {
             return true;
         }
+        if($status){
+            $permission = $this->getPermission($collection, $status);
+            $permissionLevel = ArrayUtils::get($permission, $action);
+            return $this->can($permissionLevel, $level);
+        }else{
+            $statuses = $this->getCollectionStatuses($collection);
+
+            $allowed = false;
+            foreach ($statuses as $status) {
+                $permission = $this->getPermission($collection, $status);
+                $permissionLevel = ArrayUtils::get($permission, $action);
+
+                if ($this->can($permissionLevel, $level)) {
+                    $allowed = true;
+                    break;
+                }
+            }
 
-        $permission = $this->getPermission($collection, $status);
-        $permissionLevel = ArrayUtils::get($permission, $action);
-
-        return $this->can($permissionLevel, $level);
+            return $allowed;
+        }
     }
 
     public function allowToOnce($action, $collection)

diff --git a/tests/api/AuthTest.php b/tests/api/AuthTest.php
diff --git a/tests/api/CollectionTest.php b/tests/api/CollectionTest.php