diff --git a/CHANGELOG b/CHANGELOG index c4a2265c7..55cef62e8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,18 @@ +-------------------------------------------------------------------------------- + Changes in version 4.3.19 +-------------------------------------------------------------------------------- +- end date in search form actually ends at the end of the day +- allow context sensitive help +- document chooser shows docs in root folder again +- fixed regression from 4.3.18. Documents can not be approved if + review is still pending +- polish page for document version details, add review/approval log +- take out remaining link to old version info file +- new configuration parameter for overriding the mimetype delivered + by the browser (Closes #195) +- new option -c to force recreation of index (Closes #219) +- username can be passed to utils/adddoc.php (Closes #214) + -------------------------------------------------------------------------------- Changes in version 4.3.18 -------------------------------------------------------------------------------- @@ -5,7 +20,9 @@ - search result can be restricted to folders or documents only - documents still in review can still be reviewed even if the workflow mode changes to traditional_only_approval +- approvals can be submitted, even if document was released/rejected - check for duplicate content on document/folder check page +- open tab on ViewDocument page as specified in URL -------------------------------------------------------------------------------- Changes in version 4.3.17 @@ -19,6 +36,7 @@ - fix take over of reviewers/approvers from previos version - fix calculation of quota in user list - do not show hidden users in select box of search form +- notifier can be set when new document is uploaded -------------------------------------------------------------------------------- Changes in version 4.3.16 diff --git a/SeedDMS_Core/Core/inc.ClassDocument.php b/SeedDMS_Core/Core/inc.ClassDocument.php index 042c13250..c7c833a83 100644 --- a/SeedDMS_Core/Core/inc.ClassDocument.php +++ b/SeedDMS_Core/Core/inc.ClassDocument.php @@ -2479,6 +2479,8 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ if (is_bool($res) && !$res) return false; + unset($this->_status); + return true; } /* }}} */ @@ -2680,7 +2682,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */ $reviewID = $db->getInsertID(); } else { - $reviewID = isset($indstatus["reviewID"]) ? $ $indstatus["reviewID"] : NULL; + $reviewID = isset($indstatus["reviewID"]) ? $indstatus["reviewID"] : NULL; } $queryStr = "INSERT INTO `tblDocumentReviewLog` (`reviewID`, `status`, `comment`, `date`, `userID`) ". diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml index e4672c2a0..064e3c9e9 100644 --- a/SeedDMS_Core/package.xml +++ b/SeedDMS_Core/package.xml @@ -832,5 +832,22 @@ no changes clean workflow log when a document version was deleted + + 2015-06-09 + + + 4.3.18 + 4.3.18 + + + stable + stable + + GPL License + +- add optional paramter $msg to SeedDMS_Core_DocumentContent::verifyStatus() +- add method SeedDMS_Core_DMS::getDuplicateDocumentContent() + + diff --git a/inc/inc.ClassSettings.php b/inc/inc.ClassSettings.php index 03241a115..37c1a31e8 100644 --- a/inc/inc.ClassSettings.php +++ b/inc/inc.ClassSettings.php @@ -519,7 +519,9 @@ class Settings { /* {{{ */ $this->_maxExecutionTime = ini_get("max_execution_time"); // XML Path: /configuration/system/advanced/converters - $converters = $xml->xpath('/configuration/advanced/converters/converter'); + $converters = $xml->xpath('/configuration/advanced/converters[@target="fulltext"]/converter'); + if(!$converters) + $converters = $xml->xpath('/configuration/advanced/converters/converter'); $this->_converters = array(); foreach($converters as $converter) { $tab = $converter->attributes(); diff --git a/op/op.SetReviewersApprovers.php b/op/op.SetReviewersApprovers.php index 6ca9773d4..54efefe83 100644 --- a/op/op.SetReviewersApprovers.php +++ b/op/op.SetReviewersApprovers.php @@ -463,7 +463,7 @@ foreach ($pGrpApp as $p) { UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied")); break; case -3: - UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("reviewer_already_assigned")); + UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("approver_already_assigned")); break; case -4: // email error @@ -520,7 +520,7 @@ if (count($approvalIndex["g"]) > 0) { UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("access_denied")); break; case -3: - UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("reviewer_already_removed")); + UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("approver_already_removed")); break; case -4: // email error diff --git a/out/out.SetReviewersApprovers.php b/out/out.SetReviewersApprovers.php index 794517a98..fd9ff089b 100644 --- a/out/out.SetReviewersApprovers.php +++ b/out/out.SetReviewersApprovers.php @@ -57,7 +57,7 @@ if(!$settings->_enableVersionModification) { } $overallStatus = $content->getStatus(); -if ($overallStatus["status"]==S_REJECTED || $overallStatus["status"]==S_OBSOLETE ) { +if ($overallStatus["status"]!=S_DRAFT_REV && $overallStatus["status"]!=S_DRAFT_APP) { UI::exitError(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))),getMLText("cannot_assign_invalid_state")); } diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 1459f521b..8903f54e3 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -882,7 +882,7 @@ $(document).ready(function () { print ""; print "
\n"; print ""; - print "params['rootfolderid']."\" role=\"button\" class=\"btn\" data-toggle=\"modal\">".getMLText("document")."…\n"; + print "params['rootfolderid']."\" role=\"button\" class=\"btn\" data-toggle=\"modal\">".getMLText("document")."…\n"; print "
\n"; ?>