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

BUGFIX: removing unnecessary extra function to embargo (to show document about to be published when in draft mode)

This commit is contained in:
Julian Seidenberg 2012-08-15 13:18:29 +12:00
parent dee4cb44f3
commit 55e530f918
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
code/DMSDocument.php
View File

@ -256,10 +256,16 @@ class DMSDocument extends DataObject implements DMSDocumentInterface {
/**
* Returns if this is Document is embargoed or expired.
* Also, returns if the document should be displayed on the front-end. Respecting the current reading mode
* of the site and the embargo status.
* I.e. if a document is embargoed until published, then it should still show up in draft mode.
* @return bool True or False depending on whether this document is embargoed
*/
function isHidden() {
return $this->isEmbargoed() || $this->isExpired();
$hidden = $this->isEmbargoed() || $this->isExpired();
$readingMode = Versioned::get_reading_mode();
if ($readingMode == "Stage.Stage" && $this->EmbargoedUntilPublished == true) $hidden = false;
return $hidden;
}
/**
@ -670,18 +676,6 @@ class DMSDocument extends DataObject implements DMSDocumentInterface {
$file->delete();
}
/**
* Returns if the document should be displayed on the front-end. Respecting the current reading mode
* of the site and the embargo status.
* I.e. if a document is embargoed until published, then it should still show up in draft mode.
*/
function getDisplayDocument() {
$display = !$this->isHidden();
$readingMode = Versioned::get_reading_mode();
if ($readingMode == "Stage.Stage" && $this->EmbargoedUntilPublished == true) $display = true;
return $display;
}
}
class DMSDocument_Controller extends Controller {