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

Merge pull request #1760 from open-sausages/pulls/4.0/admin-module

Browse Source 
Add dependency on admin module
This commit is contained in:
Ingo Schommer 2017-03-15 12:01:36 +13:00 committed by GitHub
commit f8d949dfa2
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/Controllers/CMSMain.php
View File

@ -4,7 +4,7 @@ namespace SilverStripe\CMS\Controllers;
use SilverStripe\Admin\AdminRootController; use SilverStripe\Admin\AdminRootController;
use SilverStripe\Admin\CMSBatchActionHandler; use SilverStripe\Admin\CMSBatchActionHandler;
use SilverStripe\Admin\CMSPreviewable; use SilverStripe\ORM\CMSPreviewable;
use SilverStripe\Admin\LeftAndMain; use SilverStripe\Admin\LeftAndMain;
use SilverStripe\CMS\BatchActions\CMSBatchAction_Archive; use SilverStripe\CMS\BatchActions\CMSBatchAction_Archive;
use SilverStripe\CMS\BatchActions\CMSBatchAction_Publish; use SilverStripe\CMS\BatchActions\CMSBatchAction_Publish;

8
code/Controllers/SilverStripeNavigator.php
View File

@ -2,7 +2,7 @@
namespace SilverStripe\CMS\Controllers; namespace SilverStripe\CMS\Controllers;
use SilverStripe\Admin\CMSPreviewable; use SilverStripe\ORM\CMSPreviewable;
use SilverStripe\Core\ClassInfo; use SilverStripe\Core\ClassInfo;
use SilverStripe\ORM\ArrayList; use SilverStripe\ORM\ArrayList;
use SilverStripe\ORM\DataObject; use SilverStripe\ORM\DataObject;
@ -23,12 +23,12 @@ class SilverStripeNavigator extends ViewableData
{ {
/** /**
* @var DataObject|CMSPreviewable * @var DataObject|\SilverStripe\ORM\CMSPreviewable
*/ */
protected $record; protected $record;
/** /**
* @param DataObject|CMSPreviewable $record * @param DataObject|\SilverStripe\ORM\CMSPreviewable $record
*/ */
public function __construct(CMSPreviewable $record) public function __construct(CMSPreviewable $record)
{ {
@ -71,7 +71,7 @@ class SilverStripeNavigator extends ViewableData
} }
/** /**
* @return DataObject|CMSPreviewable * @return DataObject|\SilverStripe\ORM\CMSPreviewable
*/ */
public function getRecord() public function getRecord()
{ {

2
code/Controllers/SilverStripeNavigatorItem.php
View File

@ -2,7 +2,7 @@
namespace SilverStripe\CMS\Controllers; namespace SilverStripe\CMS\Controllers;
use SilverStripe\Admin\CMSPreviewable; use SilverStripe\ORM\CMSPreviewable;
use SilverStripe\ORM\DataObject; use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\Versioning\Versioned; use SilverStripe\ORM\Versioning\Versioned;
use SilverStripe\Security\Member; use SilverStripe\Security\Member;

2
code/Model/SiteTree.php
View File

@ -4,7 +4,7 @@ namespace SilverStripe\CMS\Model;
use Page; use Page;
use SilverStripe\Admin\AddToCampaignHandler_FormAction; use SilverStripe\Admin\AddToCampaignHandler_FormAction;
use SilverStripe\Admin\CMSPreviewable; use SilverStripe\ORM\CMSPreviewable;
use SilverStripe\CMS\Controllers\CMSPageEditController; use SilverStripe\CMS\Controllers\CMSPageEditController;
use SilverStripe\CMS\Controllers\ContentController; use SilverStripe\CMS\Controllers\ContentController;
use SilverStripe\CMS\Controllers\ModelAsController; use SilverStripe\CMS\Controllers\ModelAsController;

1
composer.json
View File

@ -19,6 +19,7 @@
"php": ">=5.5.0", "php": ">=5.5.0",
"composer/installers": "*", "composer/installers": "*",
"silverstripe/framework": "^4.0@dev", "silverstripe/framework": "^4.0@dev",
"silverstripe/admin": "^1.0@dev",
"silverstripe/reports": "^4.0@dev", "silverstripe/reports": "^4.0@dev",
"silverstripe/siteconfig": "^4.0@dev" "silverstripe/siteconfig": "^4.0@dev"
}, },