tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-06-29 16:09:40 +02:00
Code Issues Projects Releases Wiki Activity

BUG Fix link concatenation in SilverStripeNavigator (#1560)

Browse Source 
Fixes #1557
Fixes https://github.com/tractorcow/silverstripe-fluent/issues/219
This commit is contained in:
Damian Mooyman 2016-07-26 01:34:45 +12:00 committed by Daniel Hensby
parent a8cf17b008
commit 3306deb69b
1 changed files with 105 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
code/controllers/SilverStripeNavigator.php
View File

@ -15,7 +15,7 @@
class SilverStripeNavigator extends ViewableData { class SilverStripeNavigator extends ViewableData {
/** /**
* @var DataObject * @var DataObject|CMSPreviewable
*/ */
protected $record; protected $record;
@ -24,7 +24,8 @@ class SilverStripeNavigator extends ViewableData {
* @throws InvalidArgumentException if record doesn't implement CMSPreviewable * @throws InvalidArgumentException if record doesn't implement CMSPreviewable
*/ */
public function __construct($record) { public function __construct($record) {
if(!in_array('CMSPreviewable', class_implements($record))) { parent::__construct();
if (!($record instanceof CMSPreviewable)) {
throw new InvalidArgumentException(sprintf( throw new InvalidArgumentException(sprintf(
'SilverStripeNavigator: Record of type %s doesn\'t implement CMSPreviewable', 'SilverStripeNavigator: Record of type %s doesn\'t implement CMSPreviewable',
get_class($record) get_class($record)
@ -50,6 +51,7 @@ class SilverStripeNavigator extends ViewableData {
if($class == 'SilverStripeNavigatorItem') continue; if($class == 'SilverStripeNavigatorItem') continue;
$i++; $i++;
/** @var SilverStripeNavigatorItem $item */
$item = new $class($this->record); $item = new $class($this->record);
if(!$item->canView()) continue; if(!$item->canView()) continue;
@ -76,7 +78,7 @@ class SilverStripeNavigator extends ViewableData {
/** /**
* @param DataObject $record * @param DataObject $record
* @return Array template data * @return array template data
*/ */
static public function get_for_record($record) { static public function get_for_record($record) {
$html = ''; $html = '';
@ -108,14 +110,15 @@ class SilverStripeNavigator extends ViewableData {
class SilverStripeNavigatorItem extends ViewableData { class SilverStripeNavigatorItem extends ViewableData {
/** /**
* @param DataObject * @var DataObject|CMSPreviewable
*/ */
protected $record; protected $record;
/** /**
* @param DataObject * @param DataObject $record
*/ */
public function __construct($record) { public function __construct($record) {
parent::__construct();
$this->record = $record; $this->record = $record;
} }
@ -208,7 +211,7 @@ class SilverStripeNavigatorItem extends ViewableData {
(!$currentDraft || ($currentDraft && $this->record->Version != $currentDraft->Version)) (!$currentDraft || ($currentDraft && $this->record->Version != $currentDraft->Version))
&& (!$currentLive || ($currentLive && $this->record->Version != $currentLive->Version)) && (!$currentLive || ($currentLive && $this->record->Version != $currentLive->Version))
); );
} }
return $this->record->_cached_isArchived; return $this->record->_cached_isArchived;
} }
@ -250,7 +253,6 @@ class SilverStripeNavigatorItem_CMSLink extends SilverStripeNavigatorItem {
&& !($this->record instanceof RedirectorPage) && !($this->record instanceof RedirectorPage)
); );
} }
} }
/** /**
@ -263,10 +265,14 @@ class SilverStripeNavigatorItem_StageLink extends SilverStripeNavigatorItem {
public function getHTML() { public function getHTML() {
$draftPage = $this->getDraftPage(); $draftPage = $this->getDraftPage();
if($draftPage) { if (!$draftPage) {
$this->recordLink = Controller::join_links($draftPage->AbsoluteLink(), "?stage=Stage"); return null;
return "<a ". ($this->isActive() ? 'class="current" ' : '') ."href=\"$this->recordLink\">". _t('ContentController.DRAFTSITE', 'Draft Site') ."</a>";
} }
$linkClass = $this->isActive() ? 'class="current" ' : '';
$linkTitle = _t('ContentController.DRAFTSITE', 'Draft Site');
$recordLink = Convert::raw2att(Controller::join_links($draftPage->AbsoluteLink(), "?stage=Stage"));
return "<a {$linkClass} href=\"$recordLink\">$linkTitle</a>";
} }
public function getTitle() { public function getTitle() {
@ -321,10 +327,14 @@ class SilverStripeNavigatorItem_LiveLink extends SilverStripeNavigatorItem {
public function getHTML() { public function getHTML() {
$livePage = $this->getLivePage(); $livePage = $this->getLivePage();
if($livePage) { if (!$livePage) {
$this->recordLink = Controller::join_links($livePage->AbsoluteLink(), "?stage=Live"); return null;
return "<a ". ($this->isActive() ? 'class="current" ' : '') ."href=\"$this->recordLink\">". _t('ContentController.PUBLISHEDSITE', 'Published Site') ."</a>";
} }
$linkClass = $this->isActive() ? 'class="current" ' : '';
$linkTitle = _t('ContentController.PUBLISHEDSITE', 'Published Site');
$recordLink = Convert::raw2att(Controller::join_links($livePage->AbsoluteLink(), "?stage=Live"));
return "<a {$linkClass} href=\"$recordLink\">$linkTitle</a>";
} }
public function getTitle() { public function getTitle() {
@ -372,8 +382,13 @@ class SilverStripeNavigatorItem_ArchiveLink extends SilverStripeNavigatorItem {
private static $priority = 40; private static $priority = 40;
public function getHTML() { public function getHTML() {
$this->recordLink = $this->record->AbsoluteLink(); $linkClass = $this->isActive() ? 'ss-ui-button current' : 'ss-ui-button';
return "<a class=\"ss-ui-button". ($this->isActive() ? ' current' : '') ."\" href=\"$this->recordLink?archiveDate={$this->record->LastEdited}\" target=\"_blank\">". _t('ContentController.ARCHIVEDSITE', 'Preview version') ."</a>"; $linkTitle = _t('ContentController.ARCHIVEDSITE', 'Preview version');
$recordLink = Convert::raw2att(Controller::join_links(
$this->record->AbsoluteLink(),
'?archiveDate=' . urlencode($this->record->LastEdited)
));
return "<a class=\"{$linkClass}\" href=\"$recordLink\" target=\"_blank\">$linkTitle</a>";
} }
public function getTitle() { public function getTitle() {
@ -381,14 +396,24 @@ class SilverStripeNavigatorItem_ArchiveLink extends SilverStripeNavigatorItem {
} }
public function getMessage() { public function getMessage() {
if($date = Versioned::current_archived_date()) { $date = Versioned::current_archived_date();
$dateObj = DBField::create_field('Datetime', $date); if (empty($date)) {
return "<div id=\"SilverStripeNavigatorMessage\" title=\"". _t('ContentControl.NOTEWONTBESHOWN', 'Note: this message will not be shown to your visitors') ."\">". _t('ContentController.ARCHIVEDSITEFROM', 'Archived site from') ."<br>" . $dateObj->Nice() . "</div>"; return null;
} }
/** @var SS_Datetime $dateObj */
$dateObj = DBField::create_field('Datetime', $date);
$title = _t('ContentControl.NOTEWONTBESHOWN', 'Note: this message will not be shown to your visitors');
return "<div id=\"SilverStripeNavigatorMessage\" title=\"{$title}\">"
. _t('ContentController.ARCHIVEDSITEFROM', 'Archived site from')
. "<br />" . $dateObj->Nice() . "</div>";
} }
public function getLink() { public function getLink() {
return $this->record->PreviewLink() . '?archiveDate=' . urlencode($this->record->LastEdited); return Controller::join_links(
$this->record->PreviewLink(),
'?archiveDate=' . urlencode($this->record->LastEdited)
);
} }
public function canView($member = null) { public function canView($member = null) {
@ -403,5 +428,4 @@ class SilverStripeNavigatorItem_ArchiveLink extends SilverStripeNavigatorItem {
public function isActive() { public function isActive() {
return $this->isArchived(); return $this->isArchived();
} }
} }