Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

API Update code to reflect changes in silverstripe/admin #3019

Merged
merged 1 commit into from
Nov 6, 2024
Merged

API Update code to reflect changes in silverstripe/admin #3019

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 11 additions & 14 deletions code/Controllers/CMSMain.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr

private static $menu_priority = 10;

/**
* @deprecated 5.4.0 Will be renamed to model_class
*/
private static $tree_class = SiteTree::class;
private static $model_class = SiteTree::class;

private static $session_namespace = CMSMain::class;

Expand Down Expand Up @@ -505,7 +502,7 @@ public function LinkPreview()
*/
public function SiteTreeAsUL()
{
$treeClass = $this->config()->get('tree_class');
$treeClass = $this->config()->get('model_class');
$filter = $this->getSearchFilter();

DataObject::singleton($treeClass)->prepopulateTreeDataCache(null, [
Expand Down Expand Up @@ -658,7 +655,7 @@ public function getTreeNodeClasses(SiteTree $node)
public function getsubtree(HTTPRequest $request): HTTPResponse
{
$html = $this->getSiteTreeFor(
$this->config()->get('tree_class'),
$this->config()->get('model_class'),
$request->getVar('ID'),
null,
null,
Expand Down Expand Up @@ -703,7 +700,7 @@ public function updatetreenodes(HTTPRequest $request): HTTPResponse
// Find the next & previous nodes, for proper positioning (Sort isn't good enough - it's not a raw offset)
$prev = null;

$className = $this->config()->get('tree_class');
$className = $this->config()->get('model_class');
$next = DataObject::get($className)
->filter('ParentID', $record->ParentID)
->filter('Sort:GreaterThan', $record->Sort)
Expand Down Expand Up @@ -763,7 +760,7 @@ public function savetreenode(HTTPRequest $request): HTTPResponse
);
}

$className = $this->config()->get('tree_class');
$className = $this->config()->get('model_class');
$id = $request->requestVar('ID');
$parentID = $request->requestVar('ParentID');
if (!is_numeric($id) || !is_numeric($parentID)) {
Expand Down Expand Up @@ -1253,7 +1250,7 @@ public function getRecord($id, $versionID = null)
if (!$id) {
return null;
}
$treeClass = $this->config()->get('tree_class');
$treeClass = $this->config()->get('model_class');
if ($id instanceof $treeClass) {
return $id;
}
Expand Down Expand Up @@ -1640,7 +1637,7 @@ public function getList($params = [], $parentID = 0)
if ($filter = $this->getQueryFilter($params)) {
return $filter->getFilteredPages();
} else {
$list = DataList::create($this->config()->get('tree_class'));
$list = DataList::create($this->config()->get('model_class'));
$parentID = is_numeric($parentID) ? $parentID : 0;
return $list->filter("ParentID", $parentID);
}
Expand Down Expand Up @@ -1770,7 +1767,7 @@ public function currentPageID()
*/
public function save(array $data, Form $form): HTTPResponse
{
$className = $this->config()->get('tree_class');
$className = $this->config()->get('model_class');

// Existing or new record?
$id = $data['ID'];
Expand Down Expand Up @@ -1843,7 +1840,7 @@ public function save(array $data, Form $form): HTTPResponse
*/
public function getNewItem($id, $setID = true)
{
$parentClass = $this->config()->get('tree_class');
$parentClass = $this->config()->get('model_class');
list(, $className, $parentID) = array_pad(explode('-', $id ?? ''), 3, null);

if (!is_a($className, $parentClass ?? '', true)) {
Expand Down Expand Up @@ -2027,7 +2024,7 @@ public function publish(array $data, Form $form): HTTPResponse

public function unpublish(array $data, Form $form): HTTPResponse
{
$className = $this->config()->get('tree_class');
$className = $this->config()->get('model_class');
/** @var SiteTree $record */
$record = DataObject::get_by_id($className, $data['ID']);

Expand Down Expand Up @@ -2078,7 +2075,7 @@ public function doRollback($data, $form)
$version = (isset($data['Version'])) ? (int) $data['Version'] : null;

/** @var SiteTree|Versioned $record */
$record = Versioned::get_latest_version($this->config()->get('tree_class'), $id);
$record = Versioned::get_latest_version($this->config()->get('model_class'), $id);
if ($record && !$record->canEdit()) {
return Security::permissionFailure($this);
}
Expand Down
Loading