gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-13 21:21:27 +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 2019-02-11 22:00:31 +01:00
commit 963f2b9b78
4 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -140,6 +140,7 @@
user extension user extension
- whether the apache module xsendfile is used, can be configured - whether the apache module xsendfile is used, can be configured
- add hooks for filtering tasks shown in the menu bar - add hooks for filtering tasks shown in the menu bar
- allow to set more parameters when upload a document via restapi
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 5.1.9 Changes in version 5.1.9

3
SeedDMS_Preview/Preview/PdfPreviewer.php
View File

@ -53,9 +53,10 @@ class SeedDMS_Preview_PdfPreviewer extends SeedDMS_Preview_Base {
return false; return false;
$document = $object->getDocument(); $document = $object->getDocument();
$dms = $document->_dms;
$dir = $this->previewDir.'/'.$document->getDir(); $dir = $this->previewDir.'/'.$document->getDir();
switch(get_class($object)) { switch(get_class($object)) {
case "SeedDMS_Core_DocumentContent": case $dms->getClassname('documentcontent'):
$target = $dir.'p'.$object->getVersion(); $target = $dir.'p'.$object->getVersion();
break; break;
case "SeedDMS_Core_DocumentFile": case "SeedDMS_Core_DocumentFile":

2
SeedDMS_Preview/Preview/Previewer.php
View File

@ -52,7 +52,7 @@ class SeedDMS_Preview_Previewer extends SeedDMS_Preview_Base {
* @param integer $width width of preview image * @param integer $width width of preview image
* @return string file name of preview image * @return string file name of preview image
*/ */
public function getFileName($object, $width) { /* {{{ */ protected function getFileName($object, $width) { /* {{{ */
if(!$object) if(!$object)
return false; return false;

24
SeedDMS_Preview/package.xml
View File

@ -11,11 +11,11 @@
<email>uwe@steinmann.cx</email> <email>uwe@steinmann.cx</email>
<active>yes</active> <active>yes</active>
</lead> </lead>
<date>2019-01-18</date> <date>2019-02-11</date>
<time>10:59:39</time> <time>10:59:39</time>
<version> <version>
<release>1.2.9</release> <release>1.2.10</release>
<api>1.2.9</api> <api>1.2.10</api>
</version> </version>
<stability> <stability>
<release>stable</release> <release>stable</release>
@ -26,6 +26,7 @@
make sure list of converters is always an array make sure list of converters is always an array
usage of mod_sendfile can be configured usage of mod_sendfile can be configured
new parameter for enabling/disabling xsendfile new parameter for enabling/disabling xsendfile
fix creation of pdf preview if document content class is not SeedDMS_Core_DocumentContent
</notes> </notes>
<contents> <contents>
<dir baseinstalldir="SeedDMS" name="/"> <dir baseinstalldir="SeedDMS" name="/">
@ -388,5 +389,22 @@ execWithTimeout() reads data from stderr and returns it together with stdout in
preview is also created if SeedDMS_Core_DocumentContent has a child class preview is also created if SeedDMS_Core_DocumentContent has a child class
</notes> </notes>
</release> </release>
<release>
<date>2018-07-13</date>
<time>10:59:39</time>
<version>
<release>1.2.9</release>
<api>1.2.9</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
<notes>
make sure list of converters is always an array
usage of mod_sendfile can be configured
</notes>
</release>
</changelog> </changelog>
</package> </package>