Skip to content

Commit

Permalink
ENH Update code to reflect changes to silverstripe/admin
Browse files Browse the repository at this point in the history
  • Loading branch information
GuySartorelli committed Nov 27, 2024
1 parent bfadee5 commit f30512a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
13 changes: 6 additions & 7 deletions src/CampaignAdmin.php
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ public function getClientConfig(): array
'url' => $this->Link('removeCampaignItem/:id/:itemId'),
'method' => 'post'
],
'treeClass' => $this->config()->get('model_class')
'treeClass' => $this->getModelClass()
]);
}

Expand Down Expand Up @@ -234,8 +234,7 @@ protected function getListResource()
{
$items = $this->getListItems();
$count = $items->count();
/** @var string $treeClass */
$treeClass = $this->config()->get('model_class');
$modelClass = $this->getModelClass();
$hal = [
'count' => $count,
'total' => $count,
Expand All @@ -244,12 +243,12 @@ protected function getListResource()
'href' => $this->Link('items')
]
],
'_embedded' => [$treeClass => []]
'_embedded' => [$modelClass => []]
];
foreach ($items as $item) {
$sync = $this->shouldCampaignSync($item);
$resource = $this->getChangeSetResource($item, $sync);
$hal['_embedded'][$treeClass][] = $resource;
$hal['_embedded'][$modelClass][] = $resource;
}
return $hal;
}
Expand Down Expand Up @@ -813,11 +812,11 @@ public function providePermissions()
return array(
"CMS_ACCESS_CampaignAdmin" => array(
'name' => _t(
'SilverStripe\\CMS\\Controllers\\CMSMain.ACCESS',
LeftAndMain::class . '.ACCESS',
"Access to '{title}' section",
array('title' => static::menu_title())
),
'category' => _t('SilverStripe\\Security\\Permission.CMS_ACCESS_CATEGORY', 'CMS Access'),
'category' => _t(LeftAndMain::class . '.CMS_ACCESS_CATEGORY', 'CMS Access'),
'help' => _t(
__CLASS__.'.ACCESS_HELP',
'Allow viewing of the campaign publishing section.'
Expand Down
2 changes: 1 addition & 1 deletion src/CampaignAdminList.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public function getSchemaDataDefaults()

// Get endpoints from admin
$admin = CampaignAdmin::singleton();
$data['data']['recordType'] = $admin->config()->uninherited('model_class');
$data['data']['recordType'] = $admin->getModelClass();
$oneSetAction = $admin->Link("set") . "/:id";
$setsAction = $admin->Link("sets");
$schemaEndpoint = $admin->Link("schema") . "/DetailEditForm";
Expand Down

0 comments on commit f30512a

Please sign in to comment.