tonyair/silverstripe-reports
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-reports synced 2024-10-22 11:05:53 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #697 from halkyon/cms_showing_latest_version_message

Browse Source 
Page history panel: show appropriate message when viewing latest version
This commit is contained in:
Ingo Schommer 2013-05-07 15:02:17 -07:00
commit a196933e05
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
code/controllers/CMSPageHistoryController.php
View File

@ -142,14 +142,17 @@ class CMSPageHistoryController extends CMSMain {
); );
$revert->setReadonly(true); $revert->setReadonly(true);
} } else {
else { if($record->isLatestVersion()) {
$message = _t('CMSPageHistoryController.VIEWINGLATEST', 'Currently viewing the latest version.');
} else {
$message = _t( $message = _t(
'CMSPageHistoryController.VIEWINGVERSION', 'CMSPageHistoryController.VIEWINGVERSION',
"Currently viewing version {version}.", "Currently viewing version {version}.",
array('version' => $versionID) array('version' => $versionID)
); );
} }
}
$fields->addFieldToTab('Root.Main', $fields->addFieldToTab('Root.Main',
new LiteralField('CurrentlyViewingMessage', $this->customise(array( new LiteralField('CurrentlyViewingMessage', $this->customise(array(

2
tests/controller/CMSPageHistoryControllerTest.php
View File

@ -52,7 +52,7 @@ class CMSPageHistoryControllerTest extends FunctionalTest {
$this->assertEquals($this->versionPublishCheck2, $form->Fields()->dataFieldByName('Version')->Value()); $this->assertEquals($this->versionPublishCheck2, $form->Fields()->dataFieldByName('Version')->Value());
$this->assertContains( $this->assertContains(
sprintf("Currently viewing version %s.", $this->versionPublishCheck2), 'Currently viewing the latest version',
$form->Fields()->fieldByName('Root.Main.CurrentlyViewingMessage')->getContent() $form->Fields()->fieldByName('Root.Main.CurrentlyViewingMessage')->getContent()
); );