Merge branch '4.2' into 4

silverstripe · Jun 19, 2024 · 8e170d7 · 8e170d7
2 parents 44584be + af640bb
commit 8e170d7
Show file tree

Hide file tree

Showing 8 changed files with 595 additions and 706 deletions.
diff --git a/.stylelintignore b/.stylelintignore
diff --git a/client/dist/styles/main.css b/client/dist/styles/main.css
diff --git a/client/src/styles/blog.scss b/client/src/styles/blog.scss
@@ -6,16 +6,8 @@
   width: 98.75%;
 }
 
-.blog-sidebar .WidgetHolder ul {
-  margin-left: 0;
-
-  li {
-    list-style-type: none;
-  }
-}
-
 // tag cloud related
-$base_tag_font_size: 4pt;
+$base-tag-font-size: 4pt;
 
 ul.blogTagCloud {
   list-style-type: none;
@@ -34,43 +26,51 @@ ul.blogTagCloud {
     }
   }
 
+  .blog-sidebar .WidgetHolder ul {
+    margin-left: 0;
+
+    li {
+      list-style-type: none;
+    }
+  }
+
   .tagCount10 {
-    font-size: $base_tag_font_size + 22pt;
+    font-size: $base-tag-font-size + 22pt;
   }
 
   .tagCount9 {
-    font-size: $base_tag_font_size + 20pt;
+    font-size: $base-tag-font-size + 20pt;
   }
 
   .tagCount8 {
-    font-size: $base_tag_font_size + 18pt;
+    font-size: $base-tag-font-size + 18pt;
   }
 
   .tagCount7 {
-    font-size: $base_tag_font_size + 16pt;
+    font-size: $base-tag-font-size + 16pt;
   }
 
   .tagCount6 {
-    font-size: $base_tag_font_size + 14pt;
+    font-size: $base-tag-font-size + 14pt;
   }
 
   .tagCount5 {
-    font-size: $base_tag_font_size + 12pt;
+    font-size: $base-tag-font-size + 12pt;
   }
 
   .tagCount4 {
-    font-size: $base_tag_font_size + 10pt;
+    font-size: $base-tag-font-size + 10pt;
   }
 
   .tagCount3 {
-    font-size: $base_tag_font_size + 8pt;
+    font-size: $base-tag-font-size + 8pt;
   }
 
   .tagCount2 {
-    font-size: $base_tag_font_size + 6pt;
+    font-size: $base-tag-font-size + 6pt;
   }
 
   .tagCount1 {
-    font-size: $base_tag_font_size + 4pt;
+    font-size: $base-tag-font-size + 4pt;
   }
 }
diff --git a/client/src/styles/cms.scss b/client/src/styles/cms.scss
@@ -2,11 +2,14 @@
  * CMS Styles
  */
 
-#FeaturedImage .middleColumn {
-  clear: none;
-  float: left;
+.cms table.ss-gridfield-table tr td.MergeAction a {
+  display: block;
+  height: 100%;
+  width: 100%;
 }
 
+/* stylelint-disable max-nesting-depth */
+
 .has-panel .cms-content-tools.blog-admin-sidebar {
   width: 280px;
   border-right: 0;
@@ -22,16 +25,15 @@
   }
 
   .cms-panel-toggle.south {
-    border-top: 1px solid #aaaaaa;
+    border-top: 1px solid #aaa;
   }
 
   ~ .blog-admin-outer {
     width: 100%;
     padding-right: 280px;
     position: absolute;
     height: 100%;
-    overflow-y: hidden;
-    overflow-x: hidden;
+    overflow: hidden hidden;
     box-sizing: border-box;
 
     > .ss-tabset {
@@ -109,6 +111,13 @@
   }
 }
 
+/* stylelint-enable max-nesting-depth */
+
+#FeaturedImage .middleColumn {
+  clear: none;
+  float: left;
+}
+
 .toggle-description {
   display: inline-block;
   font-size: 1.2rem;
@@ -148,12 +157,6 @@
   tr td.MergeAction {
     width: 225px;
 
-    a {
-      display: block;
-      height: 100%;
-      width: 100%;
-    }
-
     select {
       width: 150px;
     }
@@ -167,7 +170,7 @@
 
   .MergeActionReveal:after {
     content: "@";
-    font-family: silverstripe;
+    font-family: "silverstripe";
     display: inline-block;
     position: relative;
     margin-left: 10px;

diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
     "lint": "yarn lint-js && yarn lint-sass",
     "lint-js": "eslint client/src",
     "lint-js-fix": "eslint client/src --fix",
-    "lint-sass": "stylelint **/client/src/**/*.scss",
+    "lint-sass": "stylelint client/src",
     "test": "true"
   },
   "repository": {
@@ -28,7 +28,7 @@
   "homepage": "https://github.com/silverstripe/silverstripe-blog#readme",
   "dependencies": {},
   "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/Forms/GridField/GridFieldAddByDBField.php b/src/Forms/GridField/GridFieldAddByDBField.php
@@ -234,6 +234,6 @@ public function getHTMLFragments($gridField)
         $forTemplate->Fields->push($textField);
         $forTemplate->Fields->push($addAction);
 
-        return [$this->targetFragment => $forTemplate->renderWith(self::class)];
+        return [$this->targetFragment => $forTemplate->renderWith(GridFieldAddByDBField::class)];
     }
 }
diff --git a/src/Model/Blog.php b/src/Model/Blog.php
@@ -475,7 +475,7 @@ public function canEditEditors($member = null)
             return $extended;
         }
 
-        return Permission::checkMember($member, self::MANAGE_USERS);
+        return Permission::checkMember($member, Blog::MANAGE_USERS);
     }
 
     /**
@@ -499,7 +499,7 @@ public function canEditWriters($member = null)
             return true;
         }
 
-        return Permission::checkMember($member, self::MANAGE_USERS);
+        return Permission::checkMember($member, Blog::MANAGE_USERS);
     }
 
     /**
@@ -523,7 +523,7 @@ public function canEditContributors($member = null)
             return true;
         }
 
-        return Permission::checkMember($member, self::MANAGE_USERS);
+        return Permission::checkMember($member, Blog::MANAGE_USERS);
     }
 
     /**