From ebdb23657a5332e5cd6a867c76b958e5eaa47a0f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 19 Mar 2026 16:46:59 +0100
Subject: [PATCH] show parent folder in document list, use document list for
 duplicates

---
 views/bootstrap/class.ObjectCheck.php | 65 ++++++++++++++++++++++++---
 1 file changed, 58 insertions(+), 7 deletions(-)

diff --git a/views/bootstrap/class.ObjectCheck.php b/views/bootstrap/class.ObjectCheck.php
index 98014ce7f..e75323c93 100644
--- a/views/bootstrap/class.ObjectCheck.php
+++ b/views/bootstrap/class.ObjectCheck.php
@@ -64,11 +64,13 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
 			$document->verifyLastestContentExpriry();
 
 			if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
-				$txt = $this->callHook('documentListItem', $document, $previewer, false);
+				$extracontent = array();
+				$extracontent['below_title'] = $this->getListRowPath($document);
+				$txt = $this->callHook('documentListItem', $document, $previewer, false, 'list', $extracontent);
 				if(is_string($txt))
 					echo $txt;
 				else
-					echo $this->documentListRow($document, $previewer, false);
+					echo $this->documentListRow($document, $previewer, false, 0, $extracontent);
 			} else {
 				$noaccess++;
 			}
@@ -118,11 +120,13 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
 				if($object['object']->isType('document')) {
 					$document = $object['object'];
 					if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
-						$txt = $this->callHook('documentListItem', $document, $previewer, false);
+						$extracontent = array();
+						$extracontent['below_title'] = $this->getListRowPath($document);
+						$txt = $this->callHook('documentListItem', $document, $previewer, true, 'list', $extracontent);
 						if(is_string($txt))
 							echo $txt;
 						else
-							echo $this->documentListRow($document, $previewer, true);
+							echo $this->documentListRow($document, $previewer, true, 0, $extracontent);
 						echo "<td>".$object['msg'];
 						if($repair)
 							$document->repair();
@@ -133,12 +137,14 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
 				} elseif($object['object']->isType('documentcontent')) {
 					$document = $object['object']->getDocument();
 					if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+						$extracontent = array();
+						$extracontent['below_title'] = $this->getListRowPath($document);
 						echo $this->documentListRowStart($document);
-						$txt = $this->callHook('documentListItem', $document, $previewer, true, $object['object']->getVersion());
+						$txt = $this->callHook('documentListItem', $document, $previewer, true, $object['object']->getVersion(), $extracontent);
 						if(is_string($txt))
 							echo $txt;
 						else
-							echo $this->documentListRow($document, $previewer, true, $object['object']->getVersion());
+							echo $this->documentListRow($document, $previewer, true, $object['object']->getVersion(), $extracontent);
 						echo "<td>".$object['msg']."</td>";
 						echo $this->documentListRowEnd($document);
 					}
@@ -399,10 +405,22 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
 		$user = $this->params['user'];
 		$folder = $this->params['folder'];
 		$duplicateversions = $this->params['duplicateversions'];
+		$conversionmgr = $this->params['conversionmgr'];
+		$cachedir = $this->params['cachedir'];
+		$previewwidth = $this->params['previewWidthList'];
+		$previewconverters = $this->params['previewConverters'];
+		$timeout = $this->params['timeout'];
+
+		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout);
+		if($conversionmgr)
+			$previewer->setConversionMgr($conversionmgr);
+		else
+			$previewer->setConverters($previewconverters);
 
 		$this->contentHeading(getMLText("duplicate_content"));
 
 		if($duplicateversions) {
+		/*
 			print "<table class=\"table table-condensed table-sm\">";
 			print "<thead>\n<tr>\n";
 			print "<th>".getMLText("document")."</th>\n";
@@ -426,6 +444,39 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
 				print "</tr>\n";
 			}
 			print "</tbody></table>\n";
+		 */
+
+			print "<table class=\"table table-condensed table-sm\">";
+			print "<thead>\n<tr>\n";
+			print "<th></th>\n";
+			print "<th>".getMLText("name")."</th>\n";
+			print "<th>".getMLText("status")."</th>\n";
+			print "<th>".getMLText("action")."</th>\n";
+			print "<th>".getMLText("duplicates")."</th>\n";
+			print "<th></th>\n";
+			print "</tr>\n</thead>\n<tbody>\n";
+			foreach($duplicateversions as $rec) {
+				$version = $rec['content'];
+				$document = $version->getDocument();
+				if($document->getAccessMode($user) >= M_READ && $document->getLatestContent()) {
+					$extracontent = array();
+					$extracontent['below_title'] = $this->getListRowPath($document);
+					$txt = $this->callHook('documentListItem', $document, $previewer, true, 'list', $extracontent);
+					if(is_string($txt))
+						echo $txt;
+					else
+						echo $this->documentListRow($document, $previewer, true, $version->getVersion(), $extracontent);
+					echo "<td>";
+					foreach($rec['duplicates'] as $duplicate) {
+						$dupdoc = $duplicate->getDocument();
+						print "<a href=\"../out/out.ViewDocument.php?documentid=".$dupdoc->getID()."\">".$dupdoc->getID()."/".$duplicate->getVersion()."</a>";
+						echo "<br />";
+					}
+					echo "</td>";
+					echo $this->documentListRowEnd($document);
+				}
+			}
+			print "</tbody></table>\n";
 		}
 } /* }}} */
 
@@ -650,7 +701,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Theme_Style {
 				print "<td>".$ug."</td>";
 				print "<td><a href=\"../out/out.ViewDocument.php?documentid=".$rec['documentID']."\">".$rec['name']."</a></td><td>".$rec['version']."</td>";
 				print "<td>".$rec['required']."</td>";
-				print "<td><a class=\"repair\" data-action=\"list".ucfirst($process)."Without".ucfirst($ug)."\" data-required=\"".$rec['required']."\">".getMLText('delete')."</a></td>";
+				print "<td><a class=\"btn btn-danger btn-sm repair\" data-action=\"list".ucfirst($process)."Without".ucfirst($ug)."\" data-required=\"".$rec['required']."\">".getMLText('delete')."</a></td>";
 				print "</tr>\n";
 			}
 			print "</tbody></table>\n";