Merge b338e96 into 944105a

silverstripe · Feb 2, 2018 · ca2c7bc · ca2c7bc
2 parents 944105a + b338e96
commit ca2c7bc
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 5 deletions.
diff --git a/src/Models/ElementalArea.php b/src/Models/ElementalArea.php
@@ -13,6 +13,7 @@
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\HasManyList;
 use SilverStripe\ORM\UnsavedRelationList;
+use SilverStripe\Security\Permission;
 use SilverStripe\Versioned\Versioned;
 use SilverStripe\View\Requirements;
 use SilverStripe\View\SSViewer;
@@ -175,4 +176,12 @@ public function getOwnerPage()
 
         return false;
     }
+
+    public function canEdit($member = null)
+    {
+        if (Permission::check('ADMIN')) {
+            return true;
+        }
+        return $this->getOwnerPage()->canEdit($member);
+    }
 }
diff --git a/tests/ElementalAreaTest.php b/tests/ElementalAreaTest.php
@@ -4,13 +4,10 @@
 
 use DNADesign\Elemental\Extensions\ElementalPageExtension;
 use DNADesign\Elemental\Models\ElementalArea;
-use DNADesign\Elemental\Models\ElementContent;
-use DNADesign\Elemental\Forms\ElementalGridFieldAddNewMultiClass;
 use DNADesign\Elemental\Tests\Src\TestElement;
+use DNADesign\Elemental\Tests\Src\TestPage;
 use Page;
-use SilverStripe\CMS\Model\RedirectorPage;
 use SilverStripe\Dev\SapphireTest;
-use SilverStripe\Forms\GridField\GridField;
 
 class ElementalAreaTest extends SapphireTest
 {
@@ -23,7 +20,8 @@ class ElementalAreaTest extends SapphireTest
     ];
 
     protected static $extra_dataobjects = [
-        TestElement::class
+        TestElement::class,
+        TestPage::class,
     ];
 
     public function testElementControllers()
@@ -46,4 +44,18 @@ public function testForTemplate()
         $this->assertContains('Hello Test', $area->forTemplate());
         $this->assertContains('Hello Test 2', $area->forTemplate());
     }
+
+    public function testCanBePublished()
+    {
+        $member = $this->logInWithPermission('SITETREE_EDIT_ALL');
+
+        $page = $this->objFromFixture(TestPage::class, 'page1');
+        $this->assertTrue($page->canPublish($member));
+
+        $area = $this->objFromFixture(ElementalArea::class, 'area1');
+        $this->assertTrue($area->canPublish($member));
+
+        $element = $this->objFromFixture(TestElement::class, 'element1');
+        $this->assertTrue($element->canPublish($member));
+    }
 }