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

FIX Allow empty PreviewURLs for CMSPreviewable objects

Browse Source 
An empty PreviewURL will result in the "no preview available" message
displaying instead of a 404 error.
This commit is contained in:
Guy Sartorelli 2022-05-04 12:43:23 +12:00
parent 1563ab3fcf
commit c02549cf30
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
code/Controllers/SilverStripeNavigatorItem_ArchiveLink.php
View File

@ -46,10 +46,8 @@ class SilverStripeNavigatorItem_ArchiveLink extends SilverStripeNavigatorItem
public function getLink() public function getLink()
{ {
return Controller::join_links( $link = $this->record->PreviewLink();
$this->record->PreviewLink(), return $link ? Controller::join_links($link, '?archiveDate=' . urlencode($this->record->LastEdited ?? '')) : '';
'?archiveDate=' . urlencode($this->record->LastEdited ?? '')
);
} }
public function canView($member = null) public function canView($member = null)
@ -62,6 +60,7 @@ class SilverStripeNavigatorItem_ArchiveLink extends SilverStripeNavigatorItem
&& $this->isArchived() && $this->isArchived()
// Don't follow redirects in preview, they break the CMS editing form // Don't follow redirects in preview, they break the CMS editing form
&& !($record instanceof RedirectorPage) && !($record instanceof RedirectorPage)
&& $this->getLink()
); );
} }

4
code/Controllers/SilverStripeNavigatorItem_LiveLink.php
View File

@ -48,7 +48,8 @@ class SilverStripeNavigatorItem_LiveLink extends SilverStripeNavigatorItem
public function getLink() public function getLink()
{ {
return Controller::join_links($this->getLivePage()->PreviewLink(), '?stage=Live'); $link = $this->getLivePage()->PreviewLink();
return $link ? Controller::join_links($link, '?stage=Live') : '';
} }
public function canView($member = null) public function canView($member = null)
@ -60,6 +61,7 @@ class SilverStripeNavigatorItem_LiveLink extends SilverStripeNavigatorItem
&& $this->showLiveLink() && $this->showLiveLink()
&& $record->hasStages() && $record->hasStages()
&& $this->getLivePage() && $this->getLivePage()
&& $this->getLink()
); );
} }

7
code/Controllers/SilverStripeNavigatorItem_StageLink.php
View File

@ -50,8 +50,12 @@ class SilverStripeNavigatorItem_StageLink extends SilverStripeNavigatorItem
public function getLink() public function getLink()
{ {
$date = Versioned::current_archived_date(); $date = Versioned::current_archived_date();
$link = $this->record->PreviewLink();
if (!$link) {
return '';
}
return Controller::join_links( return Controller::join_links(
$this->record->PreviewLink(), $link,
'?stage=Stage', '?stage=Stage',
$date ? '?archiveDate=' . $date : null $date ? '?archiveDate=' . $date : null
); );
@ -66,6 +70,7 @@ class SilverStripeNavigatorItem_StageLink extends SilverStripeNavigatorItem
&& $this->showStageLink() && $this->showStageLink()
&& $record->hasStages() && $record->hasStages()
&& $this->getDraftPage() && $this->getDraftPage()
&& $this->getLink()
); );
} }

3
code/Controllers/SilverStripeNavigatorItem_Unversioned.php
View File

@ -19,7 +19,7 @@ class SilverStripeNavigatorItem_Unversioned extends SilverStripeNavigatorItem
public function getLink() public function getLink()
{ {
return $this->getRecord()->PreviewLink(); return $this->getRecord()->PreviewLink() ?? '';
} }
public function getTitle() public function getTitle()
@ -42,6 +42,7 @@ class SilverStripeNavigatorItem_Unversioned extends SilverStripeNavigatorItem
return ( return (
!$this->getRecord()->hasExtension(Versioned::class) !$this->getRecord()->hasExtension(Versioned::class)
&& $this->showUnversionedLink() && $this->showUnversionedLink()
&& $this->getLink()
); );
} }