From be7df6ffab2fe34ac6fede5395f552e9e856908b Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 6 May 2021 13:13:12 +0200 Subject: [PATCH 1/2] get previewwidthdetail from view in showVersionDetails() --- views/bootstrap/class.ViewDocument.php | 1 + 1 file changed, 1 insertion(+) diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php index 1f77cb57b..7fc509db3 100644 --- a/views/bootstrap/class.ViewDocument.php +++ b/views/bootstrap/class.ViewDocument.php @@ -485,6 +485,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style { $viewonlinefiletypes = $this->params['viewonlinefiletypes']; $enableownerrevapp = $this->params['enableownerrevapp']; $workflowmode = $this->params['workflowmode']; + $previewwidthdetail = $this->params['previewWidthDetail']; // verify if file exists $file_exists=file_exists($dms->contentDir . $latestContent->getPath()); From 75d033d73c12d00c14e635d5c1105f5e31330841 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 6 May 2021 13:42:18 +0200 Subject: [PATCH 2/2] use showVersionDetails() for previous versions --- views/bootstrap/class.ViewDocument.php | 112 ++----------------------- 1 file changed, 9 insertions(+), 103 deletions(-) diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php index 7fc509db3..99ffbcaab 100644 --- a/views/bootstrap/class.ViewDocument.php +++ b/views/bootstrap/class.ViewDocument.php @@ -477,7 +477,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style { print ""; } /* }}} */ - protected function showVersionDetails($latestContent, $previewer) { /* {{{ */ + protected function showVersionDetails($latestContent, $previewer, $islatest=false) { /* {{{ */ $dms = $this->params['dms']; $user = $this->params['user']; $folder = $this->params['folder']; @@ -570,7 +570,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style { $items = array(); if ($file_exists){ - if($accessop->mayEditVersion()) { + if($islatest && $accessop->mayEditVersion()) { $items[] = array('link'=>"../out/out.EditOnline.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion(), 'icon'=>'edit', 'label'=>'edit_version'); } } @@ -580,7 +580,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style { if($accessop->mayRemoveVersion()) { $items[] = array('link'=>"../out/out.RemoveVersion.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion(), 'icon'=>'remove', 'label'=>'rm_version'); } - if($accessop->mayOverwriteStatus()) { + if($islatest && $accessop->mayOverwriteStatus()) { $items[] = array('link'=>"../out/out.OverrideContentStatus.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion(), 'icon'=>'align-justify', 'label'=>'change_status'); } if($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') { @@ -601,6 +601,8 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style { if($accessop->mayEditAttributes()) { $items[] = array('link'=>"out.EditAttributes.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion(), 'icon'=>'edit', 'label'=>'edit_attributes'); } + if(!$islatest) + $items[] = array('link'=>"out.DocumentVersionDetail.php?documentid=".$latestContent->getDocument()->getId()."&version=".$latestContent->getVersion(), 'icon'=>'info', 'label'=>'details'); if($newitems = $this->callHook('extraVersionActions', $latestContent)) $items = array_merge($items, $newitems); @@ -770,7 +772,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style { $this->contentContainerStart(); $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidthdetail, $timeout, $xsendfile); $previewer->setConverters($previewconverters); - $this->showVersionDetails($latestContent, $previewer); + $this->showVersionDetails($latestContent, $previewer, true); $this->contentContainerEnd(); if($user->isAdmin()) { @@ -1275,108 +1277,12 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style { if(is_string($txt)) echo $txt; - $this->contentContainerStart(); - - print ""; - print "\n\n"; - print "\n"; - print "\n"; - print "\n\n\n"; - for ($i = count($versions)-2; $i >= 0; $i--) { $version = $versions[$i]; - $vstat = $version->getStatus(); - $workflow = $version->getWorkflow(); - $workflowstate = $version->getWorkflowState(); - - // verify if file exists - $file_exists=file_exists($dms->contentDir . $version->getPath()); - - print "\n"; - print "\n"; - print "\n"; -// print ""; - print "\n\n"; + $this->contentContainerStart(); + $this->showVersionDetails($version, $previewer, false); + $this->contentContainerEnd(); } - print "\n
"; - if($file_exists) { - if ($viewonlinefiletypes && (in_array(strtolower($version->getFileType()), $viewonlinefiletypes) || in_array(strtolower($version->getMimeType()), $viewonlinefiletypes))) { - print "getDocument()->getId()."&version=".$version->getVersion()."\">"; - } else { - print "getDocument()->getId()."&version=".$version->getVersion()."\">"; - } - } - $previewer->createPreview($version); - if($previewer->hasPreview($version)) { - print("getDocument()->getId()."&version=".$version->getVersion()."&width=".$previewwidthdetail."\" title=\"".htmlspecialchars($version->getMimeType())."\">"); - } else { - print "getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">"; - } - if($file_exists) { - print "\n"; - } - print "
    \n"; - print "
  • ".htmlspecialchars($version->getOriginalFileName())."
    • \n"; - print "
  • ".getMLText('version').": ".$version->getVersion()."
    • \n"; - if ($file_exists) print "
  • ". SeedDMS_Core_File::format_filesize($version->getFileSize()) .", ".htmlspecialchars($version->getMimeType())."
    • "; - else print "
  • ".getMLText("document_deleted")."
    • "; - $updatingUser = $version->getUser(); - print "
  • ".getMLText("uploaded_by")." getEmail())."\">".htmlspecialchars($updatingUser->getFullName())."
    • "; - print "
  • ".getLongReadableDate($version->getDate())."
    • "; - print "
  • ".getMLText('status').": ".getOverallStatusText($vstat["status"])."
    • "; - print "
\n"; - $txt = $this->callHook('showVersionComment', $version); - if($txt) { - echo $txt; - } else { - if($version->getComment()) - print "

".htmlspecialchars($version->getComment())."

"; - } - print "
    \n"; - $this->printVersionAttributes($folder, $version); - print "
".htmlspecialchars($version->getComment()).""; - if ($file_exists){ - print ""; - } - print ""; - print "
\n"; - $this->contentContainerEnd(); ?>