gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-11-26 15:32:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Uwe Steinmann 2023-02-23 07:18:42 +01:00
commit 4c3218bc0f
7 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -255,6 +255,7 @@
- add list of conversion services in debug menu of admin tool - add list of conversion services in debug menu of admin tool
- use chosen select for custom attributes - use chosen select for custom attributes
- color category (use first 6 chars of md5(category name) as hex color) - color category (use first 6 chars of md5(category name) as hex color)
- create missing preview images in category or attribute manager
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 5.1.29 Changes in version 5.1.29

2
inc/inc.Utils.php
View File

@ -1154,7 +1154,7 @@ class SeedDMS_FolderTree { /* {{{ */
$iter = new \SeedDMS\Core\RecursiveFolderIterator($folder); $iter = new \SeedDMS\Core\RecursiveFolderIterator($folder);
$iter2 = new RecursiveIteratorIterator($iter, RecursiveIteratorIterator::SELF_FIRST); $iter2 = new RecursiveIteratorIterator($iter, RecursiveIteratorIterator::SELF_FIRST);
foreach($iter2 as $ff) { foreach($iter2 as $ff) {
call_user_func($callback, $ff, $iter2->getDepth()); call_user_func($callback, $ff, $iter2->getDepth()+1);
// echo $ff->getID().': '.$ff->getFolderPathPlain().'-'.$ff->getName()."<br />"; // echo $ff->getID().': '.$ff->getFolderPathPlain().'-'.$ff->getName()."<br />";
} }
} /* }}} */ } /* }}} */

1
out/out.AttributeMgr.php
View File

@ -47,6 +47,7 @@ if(isset($_GET['attrdefid']) && $_GET['attrdefid']) {
} }
if($view) { if($view) {
$view->setParam('conversionmgr', $conversionmgr);
$view->setParam('accessobject', $accessop); $view->setParam('accessobject', $accessop);
$view->setParam('onepage', $settings->_onePageMode); // do most navigation by reloading areas of pages with ajax $view->setParam('onepage', $settings->_onePageMode); // do most navigation by reloading areas of pages with ajax
$view->setParam('attrdefs', $attrdefs); $view->setParam('attrdefs', $attrdefs);

1
out/out.Categories.php
View File

@ -46,6 +46,7 @@ if(isset($_GET['categoryid']) && $_GET['categoryid']) {
} }
if($view) { if($view) {
$view->setParam('conversionmgr', $conversionmgr);
$view->setParam('categories', $categories); $view->setParam('categories', $categories);
$view->setParam('selcategory', $selcat); $view->setParam('selcategory', $selcat);
$view->setParam('accessobject', $accessop); $view->setParam('accessobject', $accessop);

6
views/bootstrap/class.AttributeMgr.php
View File

@ -67,6 +67,7 @@ $(document).ready( function() {
function info() { /* {{{ */ function info() { /* {{{ */
$dms = $this->params['dms']; $dms = $this->params['dms'];
$user = $this->params['user']; $user = $this->params['user'];
$conversionmgr = $this->params['conversionmgr'];
$attrdefs = $this->params['attrdefs']; $attrdefs = $this->params['attrdefs'];
$selattrdef = $this->params['selattrdef']; $selattrdef = $this->params['selattrdef'];
$cachedir = $this->params['cachedir']; $cachedir = $this->params['cachedir'];
@ -134,13 +135,15 @@ $(document).ready( function() {
} }
} }
$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
if($conversionmgr)
$previewer->setConversionMgr($conversionmgr);
if($res['folders'] || $res['docs']) { if($res['folders'] || $res['docs']) {
print $this->folderListHeader(); print $this->folderListHeader();
print "<tbody>\n"; print "<tbody>\n";
foreach($res['folders'] as $subFolder) { foreach($res['folders'] as $subFolder) {
echo $this->folderListRow($subFolder); echo $this->folderListRow($subFolder);
} }
$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
foreach($res['docs'] as $document) { foreach($res['docs'] as $document) {
echo $this->documentListRow($document, $previewer); echo $this->documentListRow($document, $previewer);
} }
@ -156,7 +159,6 @@ $(document).ready( function() {
print "<th>".getMLText("status")."</th>\n"; print "<th>".getMLText("status")."</th>\n";
print "<th>".getMLText("action")."</th>\n"; print "<th>".getMLText("action")."</th>\n";
print "</tr>\n</thead>\n<tbody>\n"; print "</tr>\n</thead>\n<tbody>\n";
$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
foreach($res['contents'] as $content) { foreach($res['contents'] as $content) {
$doc = $content->getDocument(); $doc = $content->getDocument();
echo $this->documentListRow($doc, $previewer); echo $this->documentListRow($doc, $previewer);

3
views/bootstrap/class.Categories.php
View File

@ -51,6 +51,7 @@ $(document).ready( function() {
function info() { /* {{{ */ function info() { /* {{{ */
$dms = $this->params['dms']; $dms = $this->params['dms'];
$selcat = $this->params['selcategory']; $selcat = $this->params['selcategory'];
$conversionmgr = $this->params['conversionmgr'];
$cachedir = $this->params['cachedir']; $cachedir = $this->params['cachedir'];
$previewwidth = $this->params['previewWidthList']; $previewwidth = $this->params['previewWidthList'];
$timeout = $this->params['timeout']; $timeout = $this->params['timeout'];
@ -68,6 +69,8 @@ $(document).ready( function() {
print $this->folderListHeader(); print $this->folderListHeader();
print "<tbody>\n"; print "<tbody>\n";
$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile); $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
if($conversionmgr)
$previewer->setConversionMgr($conversionmgr);
foreach($documents as $doc) { foreach($documents as $doc) {
echo $this->documentListRow($doc, $previewer); echo $this->documentListRow($doc, $previewer);
} }

2
views/bootstrap/class.Indexer.php
View File

@ -37,7 +37,7 @@ class SeedDMS_View_Indexer_Process_Folder { /* {{{ */
public function process($folder, $depth=0) { /* {{{ */ public function process($folder, $depth=0) { /* {{{ */
$lucenesearch = $this->fulltextservice->Search(); $lucenesearch = $this->fulltextservice->Search();
echo "<div class=\"folder\" style=\"margin-left: ".(($depth+1)*18)."px\"><i class=\"fa fa-folder\"></i> ".$folder->getId().":".htmlspecialchars($folder->getFolderPathPlain()); echo "<div class=\"folder\" style=\"margin-left: ".(($depth+0)*18)."px\"><i class=\"fa fa-folder\"></i> ".$folder->getId().":".htmlspecialchars($folder->getFolderPathPlain());
/* If the document wasn't indexed before then just add it */ /* If the document wasn't indexed before then just add it */
if(($this->numdocs == 0) || !($hit = $lucenesearch->getFolder($folder->getId()))) { if(($this->numdocs == 0) || !($hit = $lucenesearch->getFolder($folder->getId()))) {
echo " <span id=\"status_F".$folder->getID()."\" class=\"indexme indexstatus\" data-docid=\"F".$folder->getID()."\">".getMLText('index_waiting')."</span>"; echo " <span id=\"status_F".$folder->getID()."\" class=\"indexme indexstatus\" data-docid=\"F".$folder->getID()."\">".getMLText('index_waiting')."</span>";