From fc4d2edb573192d1002373918e9b3ee49c3de424 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 25 Mar 2024 15:17:27 +0100 Subject: [PATCH] pass latest content to hooks. Fix php warnings --- out/out.CheckInDocument.php | 1 + views/bootstrap/class.CheckInDocument.php | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/out/out.CheckInDocument.php b/out/out.CheckInDocument.php index 3aefdb7b9..f944ab392 100644 --- a/out/out.CheckInDocument.php +++ b/out/out.CheckInDocument.php @@ -74,6 +74,7 @@ if($view) { $view->setParam('enableadminrevapp', $settings->_enableAdminRevApp); $view->setParam('enableownerrevapp', $settings->_enableOwnerRevApp); $view->setParam('enableselfrevapp', $settings->_enableSelfRevApp); + $view->setParam('enablehiddenrevapp', $settings->_enableHiddenRevApp); $view->setParam('enablereceiptworkflow', $settings->_enableReceiptWorkflow); $view->setParam('enableselfreceipt', $settings->_enableSelfReceipt); $view->setParam('dropfolderdir', $settings->_dropFolderDir); diff --git a/views/bootstrap/class.CheckInDocument.php b/views/bootstrap/class.CheckInDocument.php index cc5d8af1d..db02c6d31 100644 --- a/views/bootstrap/class.CheckInDocument.php +++ b/views/bootstrap/class.CheckInDocument.php @@ -69,6 +69,7 @@ $(document).ready(function() { $enableadminrevapp = $this->params['enableadminrevapp']; $enableownerrevapp = $this->params['enableownerrevapp']; $enableselfrevapp = $this->params['enableselfrevapp']; + $enablehiddenrevapp = $this->params['enablehiddenrevapp']; $enablereceiptworkflow = $this->params['enablereceiptworkflow']; $enableselfreceipt = $this->params['enableselfreceipt']; $workflowmode = $this->params['workflowmode']; @@ -203,18 +204,18 @@ $(document).ready(function() { $attrdefs = $dms->getAllAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_documentcontent, SeedDMS_Core_AttributeDefinition::objtype_all)); if($attrdefs) { foreach($attrdefs as $attrdef) { - $arr = $this->callHook('editDocumentContentAttribute', $document, $attrdef); + $arr = $this->callHook('editDocumentContentAttribute', $latestContent, $attrdef); if(is_array($arr)) { if($arr) $this->formField($arr[0], $arr[1], isset($arr[2]) ? $arr[2] : null); } elseif(is_string($arr)) { echo $arr; } else { - $this->formField(htmlspecialchars($attrdef->getName()), $this->getAttributeEditField($attrdef, $document->getAttribute($attrdef), 'attributes_version')); + $this->formField(htmlspecialchars($attrdef->getName()), $this->getAttributeEditField($attrdef, $latestContent->getAttribute($attrdef), 'attributes_version')); } } } - $arrs = $this->callHook('addDocumentContentAttributes', $document); + $arrs = $this->callHook('addDocumentContentAttributes', $latestContent); if(is_array($arrs)) { foreach($arrs as $arr) { $this->formField($arr[0], $arr[1], isset($arr[2]) ? $arr[2] : null);