Merge branch '5.2' into 5

silverstripe · Jun 19, 2024 · 0a39c9e · 0a39c9e
2 parents 90c2b85 + 12f8218
commit 0a39c9e
Show file tree

Hide file tree

Showing 4 changed files with 456 additions and 859 deletions.
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
     "dev": "NODE_ENV=development webpack --progress",
     "watch": "yarn && NODE_ENV=development webpack --watch --progress",
     "css": "WEBPACK_CHILD=css npm run build",
-    "lint": "eslint client/src; stylelint client/src/**/*.scss"
+    "lint": "eslint client/src; stylelint client/src"
   },
   "repository": {
     "type": "git",
@@ -33,7 +33,7 @@
     "redux": "^4.2.0"
   },
   "devDependencies": {
-    "@silverstripe/eslint-config": "^1.2.1",
+    "@silverstripe/eslint-config": "^1.3.0",
     "@silverstripe/webpack-config": "^2.1.0",
     "webpack": "^5.74.0",
     "webpack-cli": "^5.0.0"

diff --git a/src/Compatibility/ContentReviewCompatability.php b/src/Compatibility/ContentReviewCompatability.php
@@ -24,11 +24,11 @@ class ContentReviewCompatability
     public static function start()
     {
         $compatibility = [
-            self::SUBSITES => null,
+            ContentReviewCompatability::SUBSITES => null,
         ];
 
         if (ClassInfo::exists(Subsite::class)) {
-            $compatibility[self::SUBSITES] = Subsite::$disable_subsite_filter;
+            $compatibility[ContentReviewCompatability::SUBSITES] = Subsite::$disable_subsite_filter;
             Subsite::disable_subsite_filter(true);
         }
 
@@ -41,7 +41,7 @@ public static function start()
     public static function done(array $compatibility)
     {
         if (class_exists(Subsite::class)) {
-            Subsite::$disable_subsite_filter = $compatibility[self::SUBSITES];
+            Subsite::$disable_subsite_filter = $compatibility[ContentReviewCompatability::SUBSITES];
         }
     }
 }
diff --git a/src/Extensions/SiteTreeContentReview.php b/src/Extensions/SiteTreeContentReview.php
@@ -335,7 +335,7 @@ public function updateSettingsFields(FieldList $fields)
         Requirements::javascript('silverstripe/contentreview:client/dist/js/contentreview.js');
         // Display read-only version only
         if (!Permission::check("EDIT_CONTENT_REVIEW_FIELDS")) {
-            $schedule = self::get_schedule();
+            $schedule = SiteTreeContentReview::get_schedule();
             $contentOwners = ReadonlyField::create(
                 "ROContentOwners",
                 _t(__CLASS__ . ".CONTENTOWNERS", "Content Owners"),
@@ -429,7 +429,7 @@ public function updateSettingsFields(FieldList $fields)
         $reviewFrequency = DropdownField::create(
             "ReviewPeriodDays",
             _t(__CLASS__ . ".REVIEWFREQUENCY", "Review frequency"),
-            self::get_schedule()
+            SiteTreeContentReview::get_schedule()
         )
             ->addExtraClass('custom-setting')
             ->setDescription(_t(