mirror of
https://github.com/silverstripe/silverstripe-cms
synced 2024-09-28 20:29:20 +02:00
Merge pull request #1297 from patricknelson/issue-586-delete-validation-3.2
FIX for #586 and possible fix for #736 and relates to #2449: Don't perform validation upon deletion, since it isn't necessary.
This commit is contained in:
Damian Mooyman
commit
bc669311dd
@ -593,7 +593,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
|
||||
/**
|
||||
* @param int $id
|
||||
* @param FieldList $fields
|
||||
* @return Form
|
||||
* @return CMSForm
|
||||
*/
|
||||
public function getEditForm($id = null, $fields = null) {
|
||||
|
||||
@ -676,7 +676,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
|
||||
// if($form->Fields()->hasTabset()) $form->Fields()->findOrMakeTab('Root')->setTemplate('CMSTabSet');
|
||||
$form->setAttribute('data-pjax-fragment', 'CurrentForm');
|
||||
// Set validation exemptions for specific actions
|
||||
$form->setValidationExemptActions(array('restore', 'revert', 'deletefromlive', 'rollback'));
|
||||
$form->setValidationExemptActions(array('restore', 'revert', 'deletefromlive', 'delete', 'unpublish', 'rollback'));
|
||||
|
||||
// Announce the capability so the frontend can decide whether to allow preview or not.
|
||||
if(in_array('CMSPreviewable', class_implements($record))) {
|
||||
|
||||
@ -27,27 +27,27 @@ class CMSMainTest extends FunctionalTest {
|
||||
$this->assertArrayHasKey('All', $hints);
|
||||
|
||||
$this->assertArrayHasKey(
|
||||
'CMSMainTest_ClassA',
|
||||
$hints['All'],
|
||||
'Global list shows allowed classes'
|
||||
'CMSMainTest_ClassA',
|
||||
$hints['All'],
|
||||
'Global list shows allowed classes'
|
||||
);
|
||||
|
||||
$this->assertArrayNotHasKey(
|
||||
'CMSMainTest_HiddenClass',
|
||||
$hints['All'],
|
||||
'Global list does not list hidden classes'
|
||||
'CMSMainTest_HiddenClass',
|
||||
$hints['All'],
|
||||
'Global list does not list hidden classes'
|
||||
);
|
||||
|
||||
$this->assertNotContains(
|
||||
'CMSMainTest_ClassA',
|
||||
$hints['Root']['disallowedChildren'],
|
||||
'Limits root classes'
|
||||
'CMSMainTest_ClassA',
|
||||
$hints['Root']['disallowedChildren'],
|
||||
'Limits root classes'
|
||||
);
|
||||
|
||||
$this->assertContains(
|
||||
'CMSMainTest_NotRoot',
|
||||
$hints['Root']['disallowedChildren'],
|
||||
'Limits root classes'
|
||||
'CMSMainTest_NotRoot',
|
||||
$hints['Root']['disallowedChildren'],
|
||||
'Limits root classes'
|
||||
);
|
||||
|
||||
}
|
||||
@ -62,22 +62,22 @@ class CMSMainTest extends FunctionalTest {
|
||||
$pageB->write();
|
||||
|
||||
// Check query
|
||||
$response = $this->get('CMSMain/childfilter?ParentID='.$pageA->ID);
|
||||
$response = $this->get('CMSMain/childfilter?ParentID=' . $pageA->ID);
|
||||
$children = json_decode($response->getBody());
|
||||
$this->assertFalse($response->isError());
|
||||
|
||||
// Page A can't have unrelated children
|
||||
$this->assertContains(
|
||||
'Page',
|
||||
$children,
|
||||
'Limited parent lists disallowed classes'
|
||||
'Page',
|
||||
$children,
|
||||
'Limited parent lists disallowed classes'
|
||||
);
|
||||
|
||||
// But it can create a ClassB
|
||||
$this->assertNotContains(
|
||||
'CMSMainTest_ClassB',
|
||||
$children,
|
||||
'Limited parent omits explicitly allowed classes in disallowedChildren'
|
||||
'CMSMainTest_ClassB',
|
||||
$children,
|
||||
'Limited parent omits explicitly allowed classes in disallowedChildren'
|
||||
);
|
||||
}
|
||||
|
||||
@ -91,15 +91,15 @@ class CMSMainTest extends FunctionalTest {
|
||||
|
||||
$response = $this->get('admin/pages/publishall?confirm=1');
|
||||
$this->assertContains(
|
||||
'Done: Published 30 pages',
|
||||
$response->getBody()
|
||||
'Done: Published 30 pages',
|
||||
$response->getBody()
|
||||
);
|
||||
|
||||
$actions = CMSBatchActionHandler::config()->batch_actions;
|
||||
|
||||
// Some modules (e.g., cmsworkflow) will remove this action
|
||||
$actions = CMSBatchActionHandler::config()->batch_actions;
|
||||
if(isset($actions['publish'])) {
|
||||
if (isset($actions['publish'])) {
|
||||
$response = $this->get('admin/pages/batchactions/publish?ajax=1&csvIDs=' . implode(',', array($page1->ID, $page2->ID)));
|
||||
$responseData = Convert::json2array($response->getBody());
|
||||
$this->assertArrayHasKey($page1->ID, $responseData['modified']);
|
||||
@ -160,10 +160,10 @@ class CMSMainTest extends FunctionalTest {
|
||||
$classes = ClassInfo::subclassesFor("SiteTree");
|
||||
array_shift($classes);
|
||||
|
||||
foreach($classes as $class) {
|
||||
foreach ($classes as $class) {
|
||||
$page = new $class();
|
||||
if($page instanceof TestOnly) continue;
|
||||
if(!$page->stat('can_be_root')) continue;
|
||||
if ($page instanceof TestOnly) continue;
|
||||
if (!$page->stat('can_be_root')) continue;
|
||||
|
||||
$page->Title = "Test $class page";
|
||||
$page->write();
|
||||
@ -178,17 +178,17 @@ class CMSMainTest extends FunctionalTest {
|
||||
$this->logInWithPermission('ADMIN');
|
||||
|
||||
Config::inst()->update('SiteTree', 'enforce_strict_hierarchy', true);
|
||||
$parentPage = $this->objFromFixture('Page','page3');
|
||||
$childPage = $this->objFromFixture('Page','page1');
|
||||
$parentPage = $this->objFromFixture('Page', 'page3');
|
||||
$childPage = $this->objFromFixture('Page', 'page1');
|
||||
|
||||
$parentPage->doUnpublish();
|
||||
$childPage->doUnpublish();
|
||||
|
||||
$actions = $childPage->getCMSActions()->dataFields();
|
||||
$this->assertArrayHasKey(
|
||||
'action_publish',
|
||||
$actions,
|
||||
'Can publish a page with an unpublished parent with strict hierarchy off'
|
||||
'action_publish',
|
||||
$actions,
|
||||
'Can publish a page with an unpublished parent with strict hierarchy off'
|
||||
);
|
||||
Config::inst()->update('SiteTree', 'enforce_strict_hierarchy', false);
|
||||
}
|
||||
@ -200,7 +200,7 @@ class CMSMainTest extends FunctionalTest {
|
||||
$this->session()->inst_set('loggedInAs', $this->idFromFixture('Member', 'admin'));
|
||||
|
||||
// Set up a page that is delete from live
|
||||
$page = $this->objFromFixture('Page','page1');
|
||||
$page = $this->objFromFixture('Page', 'page1');
|
||||
$pageID = $page->ID;
|
||||
$page->doPublish();
|
||||
$page->delete();
|
||||
@ -208,7 +208,7 @@ class CMSMainTest extends FunctionalTest {
|
||||
$response = $this->get('admin/pages/edit/show/' . $pageID);
|
||||
|
||||
$livePage = Versioned::get_one_by_stage("SiteTree", "Live", array(
|
||||
'"SiteTree"."ID"' => $pageID
|
||||
'"SiteTree"."ID"' => $pageID
|
||||
));
|
||||
$this->assertInstanceOf('SiteTree', $livePage);
|
||||
$this->assertTrue($livePage->canDelete());
|
||||
@ -222,7 +222,7 @@ class CMSMainTest extends FunctionalTest {
|
||||
*/
|
||||
public function testGetRecord() {
|
||||
// Set up a page that is delete from live
|
||||
$page1 = $this->objFromFixture('Page','page1');
|
||||
$page1 = $this->objFromFixture('Page', 'page1');
|
||||
$page1ID = $page1->ID;
|
||||
$page1->doPublish();
|
||||
$page1->delete();
|
||||
@ -235,7 +235,7 @@ class CMSMainTest extends FunctionalTest {
|
||||
|
||||
// Pages that are on draft and aren't on draft should both work
|
||||
$this->assertInstanceOf('Page', $cmsMain->getRecord($page1ID));
|
||||
$this->assertInstanceOf('Page', $cmsMain->getRecord($this->idFromFixture('Page','page2')));
|
||||
$this->assertInstanceOf('Page', $cmsMain->getRecord($this->idFromFixture('Page', 'page2')));
|
||||
|
||||
// This functionality isn't actually used any more.
|
||||
$newPage = $cmsMain->getRecord('new-Page-5');
|
||||
@ -251,7 +251,7 @@ class CMSMainTest extends FunctionalTest {
|
||||
$this->assertEquals(200, $result->getStatusCode());
|
||||
}
|
||||
|
||||
public function testCreationOfTopLevelPage(){
|
||||
public function testCreationOfTopLevelPage() {
|
||||
$origFollow = $this->autoFollowRedirection;
|
||||
$this->autoFollowRedirection = false;
|
||||
|
||||
@ -262,16 +262,16 @@ class CMSMainTest extends FunctionalTest {
|
||||
$cmsUser->logIn();
|
||||
$this->get('admin/pages/add');
|
||||
$response = $this->post(
|
||||
'admin/pages/add/AddForm',
|
||||
array(
|
||||
'ParentID' => '0',
|
||||
'PageType' => 'Page',
|
||||
'Locale' => 'en_US',
|
||||
'action_doAdd' => 1,
|
||||
'ajax' => 1,
|
||||
), array(
|
||||
'X-Pjax' => 'CurrentForm,Breadcrumbs',
|
||||
)
|
||||
'admin/pages/add/AddForm',
|
||||
array(
|
||||
'ParentID' => '0',
|
||||
'PageType' => 'Page',
|
||||
'Locale' => 'en_US',
|
||||
'action_doAdd' => 1,
|
||||
'ajax' => 1,
|
||||
), array(
|
||||
'X-Pjax' => 'CurrentForm,Breadcrumbs',
|
||||
)
|
||||
);
|
||||
// should redirect, which is a permission error
|
||||
$this->assertEquals(403, $response->getStatusCode(), 'Add TopLevel page must fail for normal user');
|
||||
@ -281,28 +281,28 @@ class CMSMainTest extends FunctionalTest {
|
||||
$response = $this->get('admin/pages/add');
|
||||
|
||||
$response = $this->post(
|
||||
'admin/pages/add/AddForm',
|
||||
array(
|
||||
'ParentID' => '0',
|
||||
'PageType' => 'Page',
|
||||
'Locale' => 'en_US',
|
||||
'action_doAdd' => 1,
|
||||
'ajax' => 1,
|
||||
), array(
|
||||
'X-Pjax' => 'CurrentForm,Breadcrumbs',
|
||||
)
|
||||
'admin/pages/add/AddForm',
|
||||
array(
|
||||
'ParentID' => '0',
|
||||
'PageType' => 'Page',
|
||||
'Locale' => 'en_US',
|
||||
'action_doAdd' => 1,
|
||||
'ajax' => 1,
|
||||
), array(
|
||||
'X-Pjax' => 'CurrentForm,Breadcrumbs',
|
||||
)
|
||||
);
|
||||
|
||||
$location = $response->getHeader('X-ControllerURL');
|
||||
$this->assertNotEmpty($location, 'Must be a redirect on success');
|
||||
$this->assertContains('/show/',$location, 'Must redirect to /show/ the new page');
|
||||
$this->assertContains('/show/', $location, 'Must redirect to /show/ the new page');
|
||||
// TODO Logout
|
||||
$this->session()->inst_set('loggedInAs', NULL);
|
||||
|
||||
$this->autoFollowRedirection = $origFollow;
|
||||
}
|
||||
|
||||
public function testCreationOfRestrictedPage(){
|
||||
public function testCreationOfRestrictedPage() {
|
||||
$origFollow = $this->autoFollowRedirection;
|
||||
$this->autoFollowRedirection = false;
|
||||
|
||||
@ -312,8 +312,8 @@ class CMSMainTest extends FunctionalTest {
|
||||
// Create toplevel page
|
||||
$this->get('admin/pages/add');
|
||||
$response = $this->post(
|
||||
'admin/pages/add/AddForm',
|
||||
array('ParentID' => '0', 'PageType' => 'CMSMainTest_ClassA', 'Locale' => 'en_US', 'action_doAdd' => 1)
|
||||
'admin/pages/add/AddForm',
|
||||
array('ParentID' => '0', 'PageType' => 'CMSMainTest_ClassA', 'Locale' => 'en_US', 'action_doAdd' => 1)
|
||||
);
|
||||
$this->assertFalse($response->isError());
|
||||
preg_match('/edit\/show\/(\d*)/', $response->getHeader('Location'), $matches);
|
||||
@ -322,8 +322,8 @@ class CMSMainTest extends FunctionalTest {
|
||||
// Create allowed child
|
||||
$this->get('admin/pages/add');
|
||||
$response = $this->post(
|
||||
'admin/pages/add/AddForm',
|
||||
array('ParentID' => $newPageId, 'PageType' => 'CMSMainTest_ClassB', 'Locale' => 'en_US', 'action_doAdd' => 1)
|
||||
'admin/pages/add/AddForm',
|
||||
array('ParentID' => $newPageId, 'PageType' => 'CMSMainTest_ClassB', 'Locale' => 'en_US', 'action_doAdd' => 1)
|
||||
);
|
||||
$this->assertFalse($response->isError());
|
||||
$this->assertNull($response->getBody());
|
||||
@ -331,8 +331,8 @@ class CMSMainTest extends FunctionalTest {
|
||||
// Create disallowed child
|
||||
$this->get('admin/pages/add');
|
||||
$response = $this->post(
|
||||
'admin/pages/add/AddForm',
|
||||
array('ParentID' => $newPageId, 'PageType' => 'Page', 'Locale' => 'en_US', 'action_doAdd' => 1)
|
||||
'admin/pages/add/AddForm',
|
||||
array('ParentID' => $newPageId, 'PageType' => 'Page', 'Locale' => 'en_US', 'action_doAdd' => 1)
|
||||
);
|
||||
$this->assertEquals(403, $response->getStatusCode(), 'Add disallowed child should fail');
|
||||
|
||||
@ -375,7 +375,7 @@ class CMSMainTest extends FunctionalTest {
|
||||
$id = 'new-Member-0';
|
||||
$member = $controller->getNewItem($id, false);
|
||||
$this->fail('Should not be able to create a Member object');
|
||||
} catch(SS_HTTPResponse_Exception $e) {
|
||||
} catch (SS_HTTPResponse_Exception $e) {
|
||||
$this->assertEquals($controller->getResponse()->getStatusCode(), 302);
|
||||
}
|
||||
}
|
||||
@ -390,8 +390,8 @@ class CMSMainTest extends FunctionalTest {
|
||||
$pages = $controller->getList()->sort('Title');
|
||||
$this->assertEquals(28, $pages->count());
|
||||
$this->assertEquals(
|
||||
array('Home', 'Page 1', 'Page 10', 'Page 11', 'Page 12'),
|
||||
$pages->Limit(5)->column('Title')
|
||||
array('Home', 'Page 1', 'Page 10', 'Page 11', 'Page 12'),
|
||||
$pages->Limit(5)->column('Title')
|
||||
);
|
||||
|
||||
// Change state of tree
|
||||
@ -412,59 +412,78 @@ class CMSMainTest extends FunctionalTest {
|
||||
$pages = $controller->getList()->sort('Title');
|
||||
$this->assertEquals(26, $pages->count());
|
||||
$this->assertEquals(
|
||||
array('Home', 'Page 10', 'Page 11', 'Page 13', 'Page 14'),
|
||||
$pages->Limit(5)->column('Title')
|
||||
array('Home', 'Page 10', 'Page 11', 'Page 13', 'Page 14'),
|
||||
$pages->Limit(5)->column('Title')
|
||||
);
|
||||
|
||||
// Test deleted page filter
|
||||
$params = array(
|
||||
'FilterClass' => 'CMSSiteTreeFilter_StatusDeletedPages'
|
||||
'FilterClass' => 'CMSSiteTreeFilter_StatusDeletedPages'
|
||||
);
|
||||
$pages = $controller->getList($params);
|
||||
$this->assertEquals(1, $pages->count());
|
||||
$this->assertEquals(
|
||||
array('Page 1'),
|
||||
$pages->column('Title')
|
||||
array('Page 1'),
|
||||
$pages->column('Title')
|
||||
);
|
||||
|
||||
// Test live, but not on draft filter
|
||||
$params = array(
|
||||
'FilterClass' => 'CMSSiteTreeFilter_StatusRemovedFromDraftPages'
|
||||
'FilterClass' => 'CMSSiteTreeFilter_StatusRemovedFromDraftPages'
|
||||
);
|
||||
$pages = $controller->getList($params);
|
||||
$this->assertEquals(1, $pages->count());
|
||||
$this->assertEquals(
|
||||
array('Page 12'),
|
||||
$pages->column('Title')
|
||||
array('Page 12'),
|
||||
$pages->column('Title')
|
||||
);
|
||||
|
||||
// Test live pages filter
|
||||
$params = array(
|
||||
'FilterClass' => 'CMSSIteTreeFilter_PublishedPages'
|
||||
'FilterClass' => 'CMSSIteTreeFilter_PublishedPages'
|
||||
);
|
||||
$pages = $controller->getList($params);
|
||||
$this->assertEquals(2, $pages->count());
|
||||
$this->assertEquals(
|
||||
array('Page 11', 'Page 12'),
|
||||
$pages->column('Title')
|
||||
array('Page 11', 'Page 12'),
|
||||
$pages->column('Title')
|
||||
);
|
||||
|
||||
// Test that parentID is ignored when filtering
|
||||
$pages = $controller->getList($params, $page3->ID);
|
||||
$this->assertEquals(2, $pages->count());
|
||||
$this->assertEquals(
|
||||
array('Page 11', 'Page 12'),
|
||||
$pages->column('Title')
|
||||
array('Page 11', 'Page 12'),
|
||||
$pages->column('Title')
|
||||
);
|
||||
|
||||
// Test that parentID is respected when not filtering
|
||||
$pages = $controller->getList(array(), $page3->ID);
|
||||
$this->assertEquals(2, $pages->count());
|
||||
$this->assertEquals(
|
||||
array('Page 3.1', 'Page 3.2'),
|
||||
$pages->column('Title')
|
||||
array('Page 3.1', 'Page 3.2'),
|
||||
$pages->column('Title')
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Testing retrieval and type of CMS edit form.
|
||||
*/
|
||||
public function testGetEditForm() {
|
||||
// Login is required prior to accessing a CMS form.
|
||||
$this->loginWithPermission('ADMIN');
|
||||
|
||||
// Get a associated with a fixture page.
|
||||
$page = $this->objFromFixture('Page', 'page1');
|
||||
$controller = new CMSMain();
|
||||
$form = $controller->getEditForm($page->ID);
|
||||
$this->assertInstanceOf("CMSForm", $form);
|
||||
|
||||
// Ensure that the form will not "validate" on delete or "unpublish" actions.
|
||||
$exemptActions = $form->getValidationExemptActions();
|
||||
$this->assertContains("delete", $exemptActions);
|
||||
$this->assertContains("unpublish", $exemptActions);
|
||||
}
|
||||
}
|
||||
|
||||
class CMSMainTest_ClassA extends Page implements TestOnly {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user