tonyair/silverstripe-docsviewer
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-docsviewer synced 2024-10-22 09:05:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #151 from creative-commoners/pulls/2.0/extensible-edit-link

Browse Source 
FIX getEditLink is now extensible and Lang route handling has a fallback
This commit is contained in:
Guy Marriott 2019-02-14 20:56:02 +13:00 committed by GitHub
commit 171652b338
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
code/controllers/DocumentationViewer.php
View File

@ -213,7 +213,6 @@ class DocumentationViewer extends Controller implements PermissionProvider
ltrim($url, '/'),
strlen($base)
);
} else {
}
//
@ -276,6 +275,11 @@ class DocumentationViewer extends Controller implements PermissionProvider
// return $redirect->redirect($cleaned, 302);
// }
if ($record = $this->getManifest()->getPage($url)) {
// In SS 3 offsetSet() isn't implemented for some reason... this is a workaround
$routeParams = $this->request->routeParams();
$routeParams['Lang'] = $lang;
$this->request->setRouteParams($routeParams);
$this->record = $record;
$this->init();
@ -687,10 +691,13 @@ class DocumentationViewer extends Controller implements PermissionProvider
/**
* Returns an edit link to the current page (optional).
*
* @return string
* @return string|false
*/
public function getEditLink()
{
$editLink = false;
$entity = null;
$page = $this->getPage();
if ($page) {
@ -706,13 +713,13 @@ class DocumentationViewer extends Controller implements PermissionProvider
}
if ($version == 'trunk' && (isset($url['options']['rewritetrunktomaster']))) {
if ($version === 'trunk' && (isset($url['options']['rewritetrunktomaster']))) {
if ($url['options']['rewritetrunktomaster']) {
$version = "master";
}
}
return str_replace(
$editLink = str_replace(
array('%entity%', '%lang%', '%version%', '%path%'),
array(
$entity->title,
@ -725,7 +732,9 @@ class DocumentationViewer extends Controller implements PermissionProvider
}
}
return false;
$this->extend('updateDocumentationEditLink', $editLink, $entity);
return $editLink;
}