Merge branch '5.1' into 5

silverstripe · Nov 5, 2023 · 3156d4e · 3156d4e
2 parents 96a418a + d401365
commit 3156d4e
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 43 deletions.
diff --git a/client/src/bundles/PagesDueForReview.js b/client/src/bundles/PagesDueForReview.js
@@ -1,8 +1,5 @@
 import jQuery from 'jquery';
 
-/**
- * @todo Re-validate this with Subsites
- */
 jQuery.entwine('ss', ($) => {
   // Hide all owner dropdowns except the one for the current subsite
   function showCorrectSubsiteIDDropdown(value) {

diff --git a/src/Extensions/ContentReviewCMSExtension.php b/src/Extensions/ContentReviewCMSExtension.php
@@ -129,8 +129,6 @@ protected function findRecord($data)
      * Check if the current request has a X-Formschema-Request header set.
      * Used by conditional logic that responds to validation results
      *
-     * @todo Remove duplication. See https://github.com/silverstripe/silverstripe-admin/issues/240
-     *
      * @return bool
      */
     protected function getSchemaRequested()
@@ -142,8 +140,6 @@ protected function getSchemaRequested()
     /**
      * Generate schema for the given form based on the X-Formschema-Request header value
      *
-     * @todo Remove duplication. See https://github.com/silverstripe/silverstripe-admin/issues/240
-     *
      * @param string $schemaID ID for this schema. Required.
      * @param Form $form Required for 'state' or 'schema' response
      * @param ValidationResult $errors Required for 'error' response

diff --git a/src/Reports/PagesDueForReviewReport.php b/src/Reports/PagesDueForReviewReport.php
@@ -179,7 +179,6 @@ public function sourceRecords($params = [], $sort = null, $limit = null)
         } else {
             // Review date before
             if (!empty($params['ReviewDateBefore'])) {
-                // TODO Get value from DateField->dataValue() once we have access to form elements here
                 $nextReviewUnixSec = strtotime(
                     ' + 1 day',
                     strtotime($params['ReviewDateBefore'] ?? '')
@@ -194,7 +193,6 @@ public function sourceRecords($params = [], $sort = null, $limit = null)
 
             // Review date after
             if (!empty($params['ReviewDateAfter'])) {
-                // TODO Get value from DateField->dataValue() once we have access to form elements here
                 $records = $records->where(
                     sprintf(
                         "\"NextReviewDate\" >= '%s'",

diff --git a/tests/php/ContentReviewBaseTest.php b/tests/php/ContentReviewBaseTest.php
@@ -4,8 +4,6 @@
 
 use SilverStripe\Dev\FunctionalTest;
 use SilverStripe\CMS\Model\SiteTree;
-// @todo add translatable namespace
-use Translatable;
 
 /**
  * Extend this class when writing unit tests which are compatible with other modules.
@@ -17,36 +15,4 @@ abstract class ContentReviewBaseTest extends FunctionalTest
      * @var bool
      */
     protected $translatableEnabledBefore;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        /*
-         *  We set the locale for pages explicitly, because if we don't, then we get into a situation
-         *  where the page takes on the tester's (your) locale, and any calls to simulate subsequent requests
-         *  (e.g. $this->post()) do not seem to get passed the tester's locale,
-         *  but instead fallback to the default locale.
-         *
-         *  So we set the pages locale to be the default locale, which will then match any subsequent requests.
-         *
-         *  If creating pages in your unit tests (rather than reading from the fixtures file), you must explicitly call
-         *  self::compat() on the page, for the same reasons as above.
-         */
-        if (class_exists(Translatable::class)) {
-            $this->translatableEnabledBefore = SiteTree::has_extension(Translatable::class);
-            SiteTree::remove_extension(Translatable::class);
-        }
-    }
-
-    protected function tearDown(): void
-    {
-        if (class_exists(Translatable::class)) {
-            if ($this->translatableEnabledBefore) {
-                SiteTree::add_extension(Translatable::class);
-            }
-        }
-
-        parent::tearDown();
-    }
 }