Skip to content

Commit 5dfe3ef

Browse files
ENH Use new DataList caching (#1392)
Replaces deprecated `DataObject::get_one()` and `DataObject::get_by_id()` in favour of the new DataList query caching.
1 parent a3b788b commit 5dfe3ef

4 files changed

Lines changed: 4 additions & 4 deletions

File tree

code/Control/UserDefinedFormAdmin.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ private static function updateFormSubmissionFolderPermissions()
296296
$formSubmissionsFolder = Folder::find(static::config()->get('form_submissions_folder'));
297297
$formSubmissionsFolder->CanViewType = InheritedPermissions::ONLY_THESE_USERS;
298298
$formSubmissionsFolder->ViewerGroups()->removeAll();
299-
$formSubmissionsFolder->ViewerGroups()->add(Group::get_one(Group::class, ['"Code"' => 'administrators']));
299+
$formSubmissionsFolder->ViewerGroups()->add(Group::get()->setUseCache(true)->find('Code', 'administrators'));
300300
$formSubmissionsFolder->write();
301301
}
302302

code/Model/EditableFormField.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -954,7 +954,7 @@ public function formatDisplayRules()
954954
// Check for field dependencies / default
955955
foreach ($this->DisplayRules() as $rule) {
956956
// Get the field which is effected
957-
$formFieldWatch = DataObject::get_by_id(EditableFormField::class, $rule->ConditionFieldID);
957+
$formFieldWatch = EditableFormField::get()->setUseCache(true)->byID($rule->ConditionFieldID);
958958
// Skip deleted fields
959959
if (!$formFieldWatch) {
960960
continue;

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
],
3232
"require": {
3333
"php": "^8.3",
34-
"silverstripe/framework": "^6",
34+
"silverstripe/framework": "^6.1",
3535
"silverstripe/cms": "^6",
3636
"symbiote/silverstripe-gridfieldextensions": "^5",
3737
"silverstripe/segment-field": "^4",

tests/php/Control/UserDefinedFormControllerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ public function testMissingFolderCreated()
499499

500500
$controller->process($data, $controller->Form());
501501

502-
$field = EditableFileField::get_by_id($field->ID);
502+
$field = EditableFileField::get()->setUseCache(true)->byID($field->ID);
503503
$filter = [
504504
'ParentID' => $field->Folder()->ID,
505505
'Name' => 'testfile.jpg',

0 commit comments

Comments
 (0)