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

Merge branch '5' into 6

Browse Source
This commit is contained in:
github-actions 2024-08-15 03:14:30 +00:00
commit 2c5612bd57
3 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/BatchActions/CMSBatchAction_Archive.php
View File

@ -5,6 +5,7 @@ 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.
@ -27,6 +28,7 @@ class CMSBatchAction_Archive extends CMSBatchAction
public function applicablePages($ids) public function applicablePages($ids)
{ {
return $this->applicablePagesHelper($ids, 'canArchive'); // canArchive() is deprecated, not $this->applicablePagesHelper()
return Deprecation::withNoReplacement(fn() => $this->applicablePagesHelper($ids, 'canArchive'));
} }
} }

4
code/Controllers/CMSMain.php
View File

@ -29,6 +29,7 @@ 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;
@ -1997,7 +1998,8 @@ 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);
} }
if (!$record->canArchive()) { $canArchive = Deprecation::withNoReplacement(fn() => $record->canArchive());
if (!$canArchive) {
return Security::permissionFailure(); return Security::permissionFailure();
} }

28
code/Model/SiteTree.php
View File

@ -25,6 +25,7 @@ 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;
@ -2592,18 +2593,21 @@ 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) && $this->canArchive()) { if (($isOnDraft || $isPublished)) {
$title = $isPublished $canArchive = Deprecation::withNoReplacement(fn() => $this->canArchive());
? _t('SilverStripe\\CMS\\Controllers\\CMSMain.UNPUBLISH_AND_ARCHIVE', 'Unpublish and archive') if ($canArchive) {
: _t('SilverStripe\\CMS\\Controllers\\CMSMain.ARCHIVE', 'Archive'); $title = $isPublished
$moreOptions->push( ? _t('SilverStripe\\CMS\\Controllers\\CMSMain.UNPUBLISH_AND_ARCHIVE', 'Unpublish and archive')
FormAction::create('archive', $title) : _t('SilverStripe\\CMS\\Controllers\\CMSMain.ARCHIVE', 'Archive');
->addExtraClass('delete btn btn-secondary' . ($this->isHomePage() ? ' homepage-warning' : '')) $moreOptions->push(
->setDescription(_t( FormAction::create('archive', $title)
'SilverStripe\\CMS\\Model\\SiteTree.BUTTONDELETEDESC', ->addExtraClass('delete btn btn-secondary' . ($this->isHomePage() ? ' homepage-warning' : ''))
'Remove from draft/live and send to archive' ->setDescription(_t(
)) '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.