gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-13 13:11:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2020-09-22 10:24:19 +02:00
commit f0bdb0fda3
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@ -178,9 +178,10 @@
- allow inline editing of document name - allow inline editing of document name
- import of users does not issue an error if a group column isn't set - import of users does not issue an error if a group column isn't set
- removing a document version will not remove attachments of the document anymore - removing a document version will not remove attachments of the document anymore
- make document details page like like view document page - make document details page look like view document page
- fix selection of documents/folders - fix selection of documents/folders
- new hooks SeedDMS_View_Document::[startRightColumn|extraVersionsViews|prePreviousVersionsTab|preLatestVersionTab] - new hooks SeedDMS_View_Document::[startRightColumn|extraVersionsViews|prePreviousVersionsTab|preLatestVersionTab]
- add expiration of documents in 3 years
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 5.1.19 Changes in version 5.1.19

4
op/op.SetExpires.php
View File

@ -68,6 +68,10 @@ case "2y":
$tmp = explode('-', date('Y-m-d')); $tmp = explode('-', date('Y-m-d'));
$expires = mktime(0,0,0, $tmp[1], $tmp[2], $tmp[0]+2); $expires = mktime(0,0,0, $tmp[1], $tmp[2], $tmp[0]+2);
break; break;
case "3y":
$tmp = explode('-', date('Y-m-d'));
$expires = mktime(0,0,0, $tmp[1], $tmp[2], $tmp[0]+3);
break;
case "never": case "never":
default: default:
$expires = null; $expires = null;

1
views/bootstrap/class.SetExpires.php
View File

@ -74,6 +74,7 @@ $(document).ready( function() {
$options[] = array('1m', getMLText('expire_in_1m')); $options[] = array('1m', getMLText('expire_in_1m'));
$options[] = array('1y', getMLText('expire_in_1y')); $options[] = array('1y', getMLText('expire_in_1y'));
$options[] = array('2y', getMLText('expire_in_2y')); $options[] = array('2y', getMLText('expire_in_2y'));
$options[] = array('3y', getMLText('expire_in_3y'));
$this->formField( $this->formField(
getMLText("preset_expires"), getMLText("preset_expires"),
array( array(