tonyair
/
silverstripe-dms
mirror of https://github.com/silverstripe/silverstripe-dms
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FIX Remove fragile logic looking for page edit link between SS versions

This commit is contained in:
Robbie Averill 2017-06-15 14:31:10 +12:00
parent 4bdeb980d9
commit 4ba3e3fa60
2 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
code/cms/DMSDocumentAddController.php
View File

@ -201,9 +201,7 @@ class DMSDocumentAddController extends LeftAndMain
}
/**
* Return a link to a page. In SS <= 3.5 this is loaded from the session, whereas in SS >= 3.6 this is set
* explicitly to a class property on CMSMain. This method checks whether the URL handler to detect this ID
* exists on CMSMain, if so include it in the URL.
* Return a link to edit a page, deep linking into the document set given
*
* @param int $pageId
* @param int $documentSetId
@ -211,12 +209,10 @@ class DMSDocumentAddController extends LeftAndMain
*/
protected function getPageEditLink($pageId, $documentSetId)
{
// Only get configuration from CMSMain, not its descendants or extensions
$urlHandlers = (array) Config::inst()->get('CMSMain', 'url_handlers', Config::UNINHERITED);
$pageIdSegment = array_key_exists('EditForm/$ID', $urlHandlers) ? $pageId . '/' : '';
return Controller::join_links(
singleton('CMSPagesController')->Link(),
sprintf('edit/EditForm/%sfield/Document Sets/item/%d', $pageIdSegment, $documentSetId)
CMSPageEditController::singleton()->getEditForm($pageId)->FormAction(),
'field/Document Sets/item',
$documentSetId
);
}

9
tests/cms/DMSDocumentAddControllerTest.php
View File

@ -78,15 +78,6 @@ class DMSDocumentAddControllerTest extends FunctionalTest
$this->controller->setRequest($request);
$this->assertContains('admin/pages', $this->controller->Backlink());
$this->assertContains('123', $this->controller->Backlink());
$urlHandlers = (array) Config::inst()->get('CMSMain', 'url_handlers', Config::UNINHERITED);
if (array_key_exists('EditForm/$ID', $urlHandlers)) {
// SS 3.6 and above, ensure that the page ID is in the edit URL
$this->assertContains('admin/pages/edit/EditForm/234', $this->controller->Backlink());
} else {
// SS 3.5 and below, the page ID is loaded from the session
$this->assertNotContains('234', $this->controller->Backlink());
}
}
/**