FIX Use canDelete, not the now-deleted canArchive

silverstripe · Aug 13, 2024 · cf4a6a8 · cf4a6a8
1 parent 1bf5db0
commit cf4a6a8
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/code/Controller/AssetAdmin.php b/code/Controller/AssetAdmin.php
@@ -1081,7 +1081,7 @@ public function getObjectFromData(File $file, $thumbnailLinks = true)
         $object['filename'] = $file->Filename;
         $object['url'] = $file->AbsoluteURL;
         $object['canEdit'] = $file->canEdit();
-        $object['canDelete'] = ($file->hasMethod('canArchive')) ? $file->canArchive() : $file->canDelete();
+        $object['canDelete'] = $file->canDelete();
 
         $owner = $file->Owner();
 

diff --git a/code/GraphQL/Resolvers/AssetAdminResolver.php b/code/GraphQL/Resolvers/AssetAdminResolver.php
@@ -126,7 +126,7 @@ public static function resolveDeleteFiles($object, array $args, $context, Resolv
         $deletedIDs = [];
         $member = UserContextProvider::get($context);
         foreach ($files as $file) {
-            if ($file->canArchive($member)) {
+            if ($file->canDelete($member)) {
                 $file->doArchive();
                 $deletedIDs[] = $file->ID;
             }

diff --git a/tests/php/Controller/AssetAdminTest/FileExtension.php b/tests/php/Controller/AssetAdminTest/FileExtension.php
@@ -28,14 +28,6 @@ public function canDelete($member = null)
         }
     }
 
-    public function canArchive($member = null)
-    {
-        if ($this->owner->Name === 'disallowCanDelete.txt') {
-            return false;
-        }
-        return $this->owner->canDelete($member);
-    }
-
 
     public function canCreate($member = null, $context = [])
     {