mirror of
https://git.code.sf.net/p/seeddms/code
synced 2024-11-26 15:32:13 +00:00
call hook 'filenameDownloadItem' in search export and transmittal download
This commit is contained in:
parent
11942c825d
commit
6de426bbc3
|
@ -5,6 +5,7 @@
|
||||||
- merge changes up to 5.1.25
|
- merge changes up to 5.1.25
|
||||||
- fix sending trigger workflow notification (Closes: #522)
|
- fix sending trigger workflow notification (Closes: #522)
|
||||||
- fix updating und deleting items in document lists
|
- fix updating und deleting items in document lists
|
||||||
|
- call hook 'filenameDownloadItem' in search export and transmittal download
|
||||||
|
|
||||||
--------------------------------------------------------------------------------
|
--------------------------------------------------------------------------------
|
||||||
Changes in version 6.0.17
|
Changes in version 6.0.17
|
||||||
|
|
|
@ -39,10 +39,11 @@ class SeedDMS_Controller_TransmittalDownload extends SeedDMS_Controller_Common {
|
||||||
$document = $content->getDocument();
|
$document = $content->getDocument();
|
||||||
if ($document->getAccessMode($user) >= M_READ) {
|
if ($document->getAccessMode($user) >= M_READ) {
|
||||||
$extracols = $this->callHook('extraDownloadColumns', $document);
|
$extracols = $this->callHook('extraDownloadColumns', $document);
|
||||||
|
$filename = $this->callHook('filenameDownloadItem', $content);
|
||||||
if($rawcontent = $this->callHook('rawcontent', $content)) {
|
if($rawcontent = $this->callHook('rawcontent', $content)) {
|
||||||
$downmgr->addItem($content, $extracols, $rawcontent);
|
$downmgr->addItem($content, $extracols, $rawcontent, $filename);
|
||||||
} else
|
} else
|
||||||
$downmgr->addItem($content, $extracols);
|
$downmgr->addItem($content, $extracols, null, $filename);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -92,10 +92,11 @@ $(document).ready(function() {
|
||||||
foreach($entries as $entry) {
|
foreach($entries as $entry) {
|
||||||
if($entry->isType('document')) {
|
if($entry->isType('document')) {
|
||||||
$extracols = $this->callHook('extraDownloadColumns', $entry);
|
$extracols = $this->callHook('extraDownloadColumns', $entry);
|
||||||
|
$filename = $this->callHook('filenameDownloadItem', $entry->getLatestContent());
|
||||||
if($includecontent && $rawcontent = $this->callHook('rawcontent', $entry->getLatestContent())) {
|
if($includecontent && $rawcontent = $this->callHook('rawcontent', $entry->getLatestContent())) {
|
||||||
$downmgr->addItem($entry->getLatestContent(), $extracols, $rawcontent);
|
$downmgr->addItem($entry->getLatestContent(), $extracols, $rawcontent, $filename);
|
||||||
} else
|
} else
|
||||||
$downmgr->addItem($entry->getLatestContent(), $extracols);
|
$downmgr->addItem($entry->getLatestContent(), $extracols, null, $filename);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$filename = tempnam(sys_get_temp_dir(), '');
|
$filename = tempnam(sys_get_temp_dir(), '');
|
||||||
|
|
Loading…
Reference in New Issue
Block a user