gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-03-11 16:35:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-4.3.x' into seeddms-5.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2016-12-07 15:32:54 +01:00
commit e9e0de4d2a
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -74,6 +74,8 @@
- when updating or adding a document do not send request for approval
if review needs to be done before
- uncheck checkbox for expiration date if date is selected.
- remove some old references to Lucene when indexing a document
uploaded by fast upload
--------------------------------------------------------------------------------
Changes in version 4.3.30

1
op/op.Ajax.php
View File

@ -649,6 +649,7 @@ switch($command) {
$cats = array();
$filesize = SeedDMS_Core_File::fileSize($userfiletmp);
$res = $folder->addDocument($name, '', $expires, $user, '',
array(), $userfiletmp, basename($userfilename),
$fileType, $userfiletype, 0,

11
views/bootstrap/class.Bootstrap.php
View File

@ -1935,9 +1935,14 @@ $(document).ready( function() {
$content .= count($files)." ".getMLText("linked_files")."<br />";
if(count($links))
$content .= count($links)." ".getMLText("linked_documents")."<br />";
$content .= getOverallStatusText($status["status"])."</small>";
$content .= "</td>\n";
if($status["status"] == S_IN_WORKFLOW && $workflowmode == 'advanced') {
$workflowstate = $latestContent->getWorkflowState();
$content .= '<span title="'.getOverallStatusText($status["status"]).': '.$workflow->getName().'">'.$workflowstate->getName().'</span>';
} else {
$content .= getOverallStatusText($status["status"]);
}
$content .= "</small></td>";
// $content .= "<td>".$version."</td>";
$content .= "<td>";
$content .= "<div class=\"list-action\">";
if($document->getAccessMode($user) >= M_ALL) {