API Deletes trigger archive instead of delete

silverstripe · Oct 21, 2016 · f859464 · f859464
1 parent eedc806
commit f859464
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/code/Controller/AssetAdmin.php b/code/Controller/AssetAdmin.php
@@ -234,7 +234,7 @@ public function apiReadFolder(HTTPRequest $request)
             'parentID' => $folder->exists() ? $folder->ParentID : null, // grandparent
             'folderID' => $folderID,
             'canEdit' => $folder->canEdit(),
-            'canDelete' => $folder->canDelete(),
+            'canDelete' => $folder->canArchive(),
         ]));
 
         return $response;
@@ -292,15 +292,15 @@ public function apiDelete(HTTPRequest $request)
         }
 
         if (!min(array_map(function (File $file) {
-            return $file->canDelete();
+            return $file->canArchive();
         }, $files))) {
             return (new HTTPResponse(json_encode(['status' => 'error']), 401))
                 ->addHeader('Content-Type', 'application/json');
         }
 
         /** @var File $file */
         foreach ($files as $file) {
-            $file->delete();
+            $file->doArchive();
         }
 
         return (new HTTPResponse(json_encode(['status' => 'file was deleted'])))
@@ -768,7 +768,7 @@ protected function getObjectFromData(File $file)
             'modified' => $file->isModifiedOnDraft(),
             'draft' => $file->isOnDraftOnly(),
             'canEdit' => $file->canEdit(),
-            'canDelete' => $file->canDelete(),
+            'canDelete' => $file->canArchive(),
         );
 
         /** @var Member $owner */

diff --git a/tests/php/AssetAdminTest.php b/tests/php/AssetAdminTest.php
@@ -502,6 +502,14 @@ 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 = [])
     {
         if (isset($context['Parent']) && $context['Parent']->Name === 'disallowCanAddChildren') {