* Move permission checks to BaseElementExtension

silverstripe · Jun 8, 2016 · 1098ad8 · 1098ad8
1 parent 2a56498
commit 1098ad8
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 38 deletions.
diff --git a/_config/elemental.yml b/_config/elemental.yml
@@ -3,7 +3,7 @@ Name: elemental
 ---
 Widget:
   extensions:
-    - 'VersionedDataObject'
+    - 'BaseElementExtension'
 
 BaseElement:
   extensions:
@@ -15,7 +15,7 @@ ElementImage:
     - 'image_medium' : 'Normal'
     - 'image_small' : 'Small'
 
-
 LeftAndMain:
   extra_requirements_css:
     - 'elemental/css/elemental-admin.css'
+
diff --git a/code/extensions/BaseElementExtension.php b/code/extensions/BaseElementExtension.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * @package elemental
+ */
+class BaseElementExtension extends VersionedDataObject
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function canView($member = null)
+    {
+        return Permission::check('CMS_ACCESS_CMSMain', 'any', $member);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function canEdit($member = null)
+    {
+        return Permission::check('CMS_ACCESS_CMSMain', 'any', $member);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function canDelete($member = null)
+    {
+        return Permission::check('CMS_ACCESS_CMSMain', 'any', $member);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function canCreate($member = null)
+    {
+        return Permission::check('CMS_ACCESS_CMSMain', 'any', $member);
+    }
+}
diff --git a/code/models/BaseElement.php b/code/models/BaseElement.php
@@ -187,42 +187,6 @@ public function getCMSTitle()
         }
     }
 
-    public function canView($member = null)
-    {
-        $extended = $this->extendedCan(__FUNCTION__, $member);
-        if ($extended !== null) {
-            return $extended;
-        }
-        return Permission::check('CMS_ACCESS_CMSMain', 'any', $member);
-    }
-
-    public function canEdit($member = null)
-    {
-        $extended = $this->extendedCan(__FUNCTION__, $member);
-        if ($extended !== null) {
-            return $extended;
-        }
-        return Permission::check('CMS_ACCESS_CMSMain', 'any', $member);
-    }
-
-    public function canDelete($member = null)
-    {
-        $extended = $this->extendedCan(__FUNCTION__, $member);
-        if ($extended !== null) {
-            return $extended;
-        }
-        return Permission::check('CMS_ACCESS_CMSMain', 'any', $member);
-    }
-
-    public function canCreate($member = null)
-    {
-        $extended = $this->extendedCan(__FUNCTION__, $member);
-        if ($extended !== null) {
-            return $extended;
-        }
-        return Permission::check('CMS_ACCESS_CMSMain', 'any', $member);
-    }
-
     public function ControllerTop()
     {
         return Controller::curr();