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

This commit is contained in:
Uwe Steinmann 2025-03-18 10:41:42 +01:00
commit bfe17bcc46
3 changed files with 14 additions and 3 deletions

View File

@ -330,6 +330,7 @@
- fix setting attributes of type user, group, document, folder when updating
a document
- objects can be removed from clipboard
- call hooks for document/folder list in attribute manager
--------------------------------------------------------------------------------
Changes in version 5.1.38

View File

@ -57,6 +57,8 @@ if($view) {
$view->setParam('enableRecursiveCount', $settings->_enableRecursiveCount);
$view->setParam('maxRecursiveCount', $settings->_maxRecursiveCount);
$view->setParam('previewWidthList', $settings->_previewWidthList);
$view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array());
$view->setParam('convertToPdf', $settings->_convertToPdf);
$view->setParam('timeout', $settings->_cmdTimeout);
$view->setParam('accessobject', $accessop);
$view->setParam('xsendfile', $settings->_enableXsendfile);

View File

@ -161,7 +161,11 @@ $(document).ready( function() {
foreach($res['docs'] as $document) {
$extracontent = array();
$extracontent['below_title'] = $this->getListRowPath($document);
echo $this->documentListRow($document, $previewer, false, 0, $extracontent);
$txt = $this->callHook('documentListItem', $document, $previewer, false, 'attributemgr', $extracontent);
if(is_string($txt))
echo $txt;
else
echo $this->documentListRow($document, $previewer, false, 0, $extracontent);
}
echo "</tbody>\n</table>\n";
@ -176,10 +180,14 @@ $(document).ready( function() {
print "<th>".getMLText("action")."</th>\n";
print "</tr>\n</thead>\n<tbody>\n";
foreach($res['contents'] as $content) {
$doc = $content->getDocument();
$document = $content->getDocument();
$extracontent = array();
$extracontent['below_title'] = $this->getListRowPath($doc);
echo $this->documentListRow($doc, $previewer, false, 0, $extracontent);
$txt = $this->callHook('documentListItem', $document, $previewer, false, 'attributemgr', $extracontent);
if(is_string($txt))
echo $txt;
else
echo $this->documentListRow($document, $previewer, false, 0, $extracontent);
}
print "</tbody></table>";
}