tonyair/silverstripe-blog
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-blog synced 2024-10-22 11:05:58 +02:00
Code Issues Projects Releases Wiki Activity

BUG Fix editors not being able to create categories / tags

Browse Source 
Remove debug::dump from tests
Hide options if not allowed to edit the blog
This commit is contained in:
Damian Mooyman 2015-03-25 14:59:58 +13:00
parent 3be06ffd20
commit 45a1af4a0d
6 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
code/model/Blog.php
View File

@ -82,6 +82,9 @@ class Blog extends Page implements PermissionProvider {
$self =& $this; $self =& $this;
$this->beforeUpdateCMSFields(function($fields) use ($self) { $this->beforeUpdateCMSFields(function($fields) use ($self) {
// Don't show this tab if edit is not allowed
if(!$self->canEdit()) return;
// Create categories and tag config // Create categories and tag config
$config = GridFieldConfig_RecordEditor::create(); $config = GridFieldConfig_RecordEditor::create();
$config->removeComponentsByType("GridFieldAddNewButton"); $config->removeComponentsByType("GridFieldAddNewButton");

5
code/model/BlogCategory.php
View File

@ -84,7 +84,10 @@ class BlogCategory extends DataObject {
if($extended !== null) { if($extended !== null) {
return $extended; return $extended;
} }
return $this->Blog()->canEdit($member);
// Since there is no parent yet, need to make a best guess
$permission = Blog::config()->grant_user_permission;
return Permission::checkMember($member, $permission);
} }

5
code/model/BlogTag.php
View File

@ -76,7 +76,10 @@ class BlogTag extends DataObject {
if($extended !== null) { if($extended !== null) {
return $extended; return $extended;
} }
return $this->Blog()->canEdit($member);
// Since there is no parent yet, need to make a best guess
$permission = Blog::config()->grant_user_permission;
return Permission::checkMember($member, $permission);
} }

10
tests/BlogCategoryTest.php
View File

@ -77,17 +77,9 @@ class BlogCategoryTest extends FunctionalTest {
$editor = $this->objFromFixture('Member', 'editor'); $editor = $this->objFromFixture('Member', 'editor');
// The first blog can bew viewed by anybody // The first blog can bew viewed by anybody
$category = $this->objFromFixture("BlogCategory", "firstcategory"); $category = singleton('BlogCategory');
$this->assertTrue($category->canCreate($admin), "Admin should be able to create category."); $this->assertTrue($category->canCreate($admin), "Admin should be able to create category.");
$this->assertTrue($category->canCreate($editor), "Editor should be able to create category."); $this->assertTrue($category->canCreate($editor), "Editor should be able to create category.");
$category = $this->objFromFixture("BlogCategory", "secondcategory");
$this->assertTrue($category->canCreate($admin), "Admin should be able to create category.");
$this->assertFalse($category->canCreate($editor), "Editor should not be able to create category.");
$category = $this->objFromFixture("BlogCategory", "thirdcategory");
$this->assertTrue($category->canCreate($admin), "Admin should always be able to create category.");
$this->assertTrue($category->canCreate($editor), "Editor should be able to create category.");
} }

10
tests/BlogTagTest.php
View File

@ -77,17 +77,9 @@ class BlogTagTest extends FunctionalTest {
$editor = $this->objFromFixture('Member', 'editor'); $editor = $this->objFromFixture('Member', 'editor');
// The first blog can bew viewed by anybody // The first blog can bew viewed by anybody
$tag = $this->objFromFixture("BlogTag", "firsttag"); $tag = singleton("BlogTag");
$this->assertTrue($tag->canCreate($admin), "Admin should be able to create tag."); $this->assertTrue($tag->canCreate($admin), "Admin should be able to create tag.");
$this->assertTrue($tag->canCreate($editor), "Editor should be able to create tag."); $this->assertTrue($tag->canCreate($editor), "Editor should be able to create tag.");
$tag = $this->objFromFixture("BlogTag", "secondtag");
$this->assertTrue($tag->canCreate($admin), "Admin should be able to create tag.");
$this->assertFalse($tag->canCreate($editor), "Editor should not be able to create tag.");
$tag = $this->objFromFixture("BlogTag", "thirdtag");
$this->assertTrue($tag->canCreate($admin), "Admin should always be able to create tags.");
$this->assertTrue($tag->canCreate($editor), "Editor should be able to create tag.");
} }

1
tests/BlogTest.php
View File

@ -111,7 +111,6 @@ class BlogTest extends SapphireTest {
// Check that editors have all permissions on their own blog // Check that editors have all permissions on their own blog
$this->assertTrue($blog->canEdit($editor)); $this->assertTrue($blog->canEdit($editor));
Debug::dump($blog2->Editors()->count());
$this->assertFalse($blog2->canEdit($editor)); $this->assertFalse($blog2->canEdit($editor));
$this->assertTrue($blog->canAddChildren($editor)); $this->assertTrue($blog->canAddChildren($editor));
$this->assertFalse($blog2->canAddChildren($editor)); $this->assertFalse($blog2->canAddChildren($editor));