From 7c1ca456bafee6d5fa9c7dffa997f80be475ff08 Mon Sep 17 00:00:00 2001 From: Sabina Talipova Date: Wed, 11 Oct 2023 12:02:23 +1300 Subject: [PATCH] MNT Remove TODO --- code/Form/UserForm.php | 2 -- code/Model/EditableFormField/EditableCheckboxGroupField.php | 1 - code/Model/EditableFormField/EditableLiteralField.php | 1 - code/Model/Recipient/EmailRecipient.php | 2 +- code/Task/RecoverUploadLocationsHelper.php | 2 -- tests/php/Model/UserDefinedFormTest.php | 1 - 6 files changed, 1 insertion(+), 8 deletions(-) diff --git a/code/Form/UserForm.php b/code/Form/UserForm.php index c9ecf5dec..106452fed 100644 --- a/code/Form/UserForm.php +++ b/code/Form/UserForm.php @@ -135,8 +135,6 @@ public function getFormFields() * can manipulate these by using {@link updateFormActions()} on * a decorator. * - * @todo Make form actions editable via their own field editor. - * * @return FieldList */ public function getFormActions() diff --git a/code/Model/EditableFormField/EditableCheckboxGroupField.php b/code/Model/EditableFormField/EditableCheckboxGroupField.php index 96e7e1321..b041c5ee8 100755 --- a/code/Model/EditableFormField/EditableCheckboxGroupField.php +++ b/code/Model/EditableFormField/EditableCheckboxGroupField.php @@ -61,7 +61,6 @@ public function getValueFromData($data) public function getSelectorField(EditableCustomRule $rule, $forOnLoad = false) { // watch out for checkboxs as the inputs don't have values but are 'checked - // @todo - Test this if ($rule->FieldValue) { return "$(\"input[name='{$this->Name}[]'][value='{$rule->FieldValue}']\")"; } else { diff --git a/code/Model/EditableFormField/EditableLiteralField.php b/code/Model/EditableFormField/EditableLiteralField.php index 9d71be9c7..ffd5509ad 100644 --- a/code/Model/EditableFormField/EditableLiteralField.php +++ b/code/Model/EditableFormField/EditableLiteralField.php @@ -149,7 +149,6 @@ public function getFormField() $field = CompositeField::create($content) ->setName($this->Name) - // ->setID($this->Name) // @todo: https://github.com/silverstripe/silverstripe-framework/issues/7264 ->setFieldHolderTemplate(__CLASS__ . '_holder'); $this->doUpdateFormField($field); diff --git a/code/Model/Recipient/EmailRecipient.php b/code/Model/Recipient/EmailRecipient.php index 59202e3a5..26ff6fe8b 100644 --- a/code/Model/Recipient/EmailRecipient.php +++ b/code/Model/Recipient/EmailRecipient.php @@ -177,7 +177,7 @@ protected function getFormParent() } // Revert to checking for a form from the session - // LeftAndMain::sessionNamespace is protected. @todo replace this with a non-deprecated equivalent. + // LeftAndMain::sessionNamespace is protected. $sessionNamespace = $this->config()->get('session_namespace') ?: CMSMain::class; $formID = Controller::curr()->getRequest()->getSession()->get($sessionNamespace . '.currentPage'); diff --git a/code/Task/RecoverUploadLocationsHelper.php b/code/Task/RecoverUploadLocationsHelper.php index 65f23095a..1961c830c 100644 --- a/code/Task/RecoverUploadLocationsHelper.php +++ b/code/Task/RecoverUploadLocationsHelper.php @@ -447,8 +447,6 @@ private function chunk($chunkSize = 100) '"SubmittedFileFieldTable"."UploadedFileID" > ?' => $greaterThanID ])->execute(); - // TODO: Versioned::prepopulate_versionnumber_cache - foreach ($chunk as $item) { yield $item; $greaterThanID = $item['UploadedFileID']; diff --git a/tests/php/Model/UserDefinedFormTest.php b/tests/php/Model/UserDefinedFormTest.php index 203a1a540..c434201ff 100644 --- a/tests/php/Model/UserDefinedFormTest.php +++ b/tests/php/Model/UserDefinedFormTest.php @@ -49,7 +49,6 @@ public function testRollbackToVersion() 'UserDefinedForm::rollback() has not been implemented completely' ); - // @todo $this->logInWithPermission('ADMIN'); /** @var UserDefinedForm|Versioned $form */ $form = $this->objFromFixture(UserDefinedForm::class, 'basic-form-page');