mirror of
https://github.com/silverstripe/silverstripe-cms
synced 2024-10-22 08:05:56 +02:00
Merge pull request #3015 from creative-commoners/pulls/6/new-admincontroller
API Update method signature to match parent class
This commit is contained in:
commit
84740116a9
10
_config.php
10
_config.php
@ -1,10 +1,5 @@
|
||||
<?php
|
||||
|
||||
use SilverStripe\Admin\CMSMenu;
|
||||
use SilverStripe\CMS\Controllers\CMSMain;
|
||||
use SilverStripe\CMS\Controllers\CMSPageAddController;
|
||||
use SilverStripe\CMS\Controllers\CMSPageEditController;
|
||||
use SilverStripe\CMS\Controllers\CMSPageSettingsController;
|
||||
use SilverStripe\CMS\Model\SiteTree;
|
||||
use SilverStripe\Core\Manifest\ModuleLoader;
|
||||
use SilverStripe\Forms\HTMLEditor\TinyMCEConfig;
|
||||
@ -31,8 +26,3 @@ ShortcodeParser::get('default')->register(
|
||||
'sitetree_link',
|
||||
[SiteTree::class, 'link_shortcode_handler']
|
||||
);
|
||||
|
||||
CMSMenu::remove_menu_class(CMSMain::class);
|
||||
CMSMenu::remove_menu_class(CMSPageEditController::class);
|
||||
CMSMenu::remove_menu_class(CMSPageSettingsController::class);
|
||||
CMSMenu::remove_menu_class(CMSPageAddController::class);
|
||||
|
@ -32,6 +32,8 @@ class CMSPageAddController extends CMSPageEditController
|
||||
private static $menu_title = 'Add page';
|
||||
private static $required_permission_codes = 'CMS_ACCESS_CMSMain';
|
||||
|
||||
private static $ignore_menuitem = true;
|
||||
|
||||
private static $allowed_actions = [
|
||||
'AddForm',
|
||||
'doAdd',
|
||||
|
@ -28,11 +28,13 @@ class CMSPageEditController extends CMSMain
|
||||
|
||||
private static $required_permission_codes = 'CMS_ACCESS_CMSMain';
|
||||
|
||||
private static $ignore_menuitem = true;
|
||||
|
||||
private static $allowed_actions = [
|
||||
'AddToCampaignForm',
|
||||
];
|
||||
|
||||
public function getClientConfig()
|
||||
public function getClientConfig(): array
|
||||
{
|
||||
return ArrayLib::array_merge_recursive(parent::getClientConfig(), [
|
||||
'form' => [
|
||||
|
@ -15,6 +15,8 @@ class CMSPageSettingsController extends CMSMain
|
||||
|
||||
private static $required_permission_codes = 'CMS_ACCESS_CMSMain';
|
||||
|
||||
private static $ignore_menuitem = true;
|
||||
|
||||
public function getEditForm($id = null, $fields = null)
|
||||
{
|
||||
$record = $this->getRecord($id ?: $this->currentPageID());
|
||||
|
Loading…
Reference in New Issue
Block a user