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

BUGFIX: fixing small problem with not setting the expiry off again

This commit is contained in:
Julian Seidenberg 2012-08-14 11:44:12 +12:00
parent 2dbd0d89c1
commit 7debe98641
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/DMSDocument.php
View File

@ -566,8 +566,8 @@ class DMSDocument extends DataObject implements DMSDocumentInterface {
if ($this->Embargo == 3) $this->embargoUntilDate($this->EmbargoedUntilDate, false);
}
if (isset($this->Expire)) {
if ($this->Expire == 1) $this->expireAtDate($this->ExpireAtDate, false);
if (isset($this->Expiry)) {
if ($this->Expiry == 1) $this->expireAtDate($this->ExpireAtDate, false);
else $this->clearExpiry(false); //clear all previous settings
}
}

4
javascript/DMSDocumentCMSFields.js
View File

@ -82,6 +82,10 @@
//show the replace panel when the page loads
$('li[data-panel="embargo"]').click();
//set the initial state of the radio button and the associated dropdown hiding
$('#Form_ItemEditForm_Embargo input').change();
$('#Form_ItemEditForm_Expiry input').change();
}
});