tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity

FIX Use canDelete, not the now-deleted canArchive (#2984)

Browse Source
This commit is contained in:
Guy Sartorelli 2024-08-16 11:30:58 +12:00 committed by GitHub
parent 2c5612bd57
commit 7cb813d45e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/BatchActions/CMSBatchAction_Archive.php
View File

@ -5,7 +5,6 @@ namespace SilverStripe\CMS\BatchActions;
use SilverStripe\ORM\SS_List; use SilverStripe\ORM\SS_List;
use SilverStripe\Admin\CMSBatchAction; use SilverStripe\Admin\CMSBatchAction;
use SilverStripe\Control\HTTPResponse; use SilverStripe\Control\HTTPResponse;
use SilverStripe\Dev\Deprecation;
/** /**
* Delete items batch action. * Delete items batch action.
@ -28,7 +27,6 @@ class CMSBatchAction_Archive extends CMSBatchAction
public function applicablePages($ids) public function applicablePages($ids)
{ {
// canArchive() is deprecated, not $this->applicablePagesHelper() return $this->applicablePagesHelper($ids, 'canDelete');
return Deprecation::withNoReplacement(fn() => $this->applicablePagesHelper($ids, 'canArchive'));
} }
} }

4
code/Controllers/CMSMain.php
View File

@ -29,7 +29,6 @@ use SilverStripe\Core\Convert;
use SilverStripe\Core\Environment; use SilverStripe\Core\Environment;
use SilverStripe\Core\Flushable; use SilverStripe\Core\Flushable;
use SilverStripe\Core\Injector\Injector; use SilverStripe\Core\Injector\Injector;
use SilverStripe\Dev\Deprecation;
use SilverStripe\Forms\DateField; use SilverStripe\Forms\DateField;
use SilverStripe\Forms\DropdownField; use SilverStripe\Forms\DropdownField;
use SilverStripe\Forms\FieldGroup; use SilverStripe\Forms\FieldGroup;
@ -1998,8 +1997,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
if (!$record || !$record->exists()) { if (!$record || !$record->exists()) {
throw new HTTPResponse_Exception("Bad record ID #$id", 404); throw new HTTPResponse_Exception("Bad record ID #$id", 404);
} }
$canArchive = Deprecation::withNoReplacement(fn() => $record->canArchive()); if (!$record->canDelete()) {
if (!$canArchive) {
return Security::permissionFailure(); return Security::permissionFailure();
} }

28
code/Model/SiteTree.php
View File

@ -25,7 +25,6 @@ use SilverStripe\Core\Manifest\ModuleResource;
use SilverStripe\Core\Manifest\ModuleResourceLoader; use SilverStripe\Core\Manifest\ModuleResourceLoader;
use SilverStripe\Core\Manifest\VersionProvider; use SilverStripe\Core\Manifest\VersionProvider;
use SilverStripe\Core\Resettable; use SilverStripe\Core\Resettable;
use SilverStripe\Dev\Deprecation;
use SilverStripe\Forms\CheckboxField; use SilverStripe\Forms\CheckboxField;
use SilverStripe\Forms\CompositeField; use SilverStripe\Forms\CompositeField;
use SilverStripe\Forms\DropdownField; use SilverStripe\Forms\DropdownField;
@ -2593,21 +2592,18 @@ class SiteTree extends DataObject implements PermissionProvider, i18nEntityProvi
} }
// If a page is on any stage it can be archived // If a page is on any stage it can be archived
if (($isOnDraft || $isPublished)) { if (($isOnDraft || $isPublished) && $this->canDelete()) {
$canArchive = Deprecation::withNoReplacement(fn() => $this->canArchive()); $title = $isPublished
if ($canArchive) { ? _t('SilverStripe\\CMS\\Controllers\\CMSMain.UNPUBLISH_AND_ARCHIVE', 'Unpublish and archive')
$title = $isPublished : _t('SilverStripe\\CMS\\Controllers\\CMSMain.ARCHIVE', 'Archive');
? _t('SilverStripe\\CMS\\Controllers\\CMSMain.UNPUBLISH_AND_ARCHIVE', 'Unpublish and archive') $moreOptions->push(
: _t('SilverStripe\\CMS\\Controllers\\CMSMain.ARCHIVE', 'Archive'); FormAction::create('archive', $title)
$moreOptions->push( ->addExtraClass('delete btn btn-secondary' . ($this->isHomePage() ? ' homepage-warning' : ''))
FormAction::create('archive', $title) ->setDescription(_t(
->addExtraClass('delete btn btn-secondary' . ($this->isHomePage() ? ' homepage-warning' : '')) 'SilverStripe\\CMS\\Model\\SiteTree.BUTTONDELETEDESC',
->setDescription(_t( 'Remove from draft/live and send to archive'
'SilverStripe\\CMS\\Model\\SiteTree.BUTTONDELETEDESC', ))
'Remove from draft/live and send to archive' );
))
);
}
} }
// "save", supports an alternate state that is still clickable, but notifies the user that the action is not needed. // "save", supports an alternate state that is still clickable, but notifies the user that the action is not needed.