diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/browseUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/browseUI.inc index f66f358..bbeb847 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/browseUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/browseUI.inc @@ -279,16 +279,19 @@ function renderSortHeadings($sSortBy, $sSortDirection) { */ function renderDocumentList($aResults, $sNoDocumentsMessage, $sNoPermissionMessage, $bDisplayFullPath = false, $bTemplateBrowsing = false) { global $default; - + $iFolderCount = count($aResults["folders"]) - 1; // loop through the files and display links if (count($aResults["documents"]) > 0) { for ($i=0; $i" . ($bTemplateBrowsing ? displayDocumentLinkForTemplateBrowsing($aResults["documents"][$i], $bDisplayFullPath) : displayDocumentLink($aResults["documents"][$i], $bDisplayFullPath)) . ""; + $sToRender .= "" . + ($bTemplateBrowsing ? displayDocumentLinkForTemplateBrowsing($aResults["documents"][$i], $bDisplayFullPath) : + displayDocumentLink($aResults["documents"][$i], $bDisplayFullPath)) . ""; - $sToRender .= "" . $aResults["documents"][$i]->getFileName() . ""; + // #3425 the title is now the filename, and the description is the title + $sToRender .= "" . $aResults["documents"][$i]->getName() . ""; $oCreator = User::get($aResults["documents"][$i]->getCreatorID()); $sToRender .= "" . ($oCreator ? $oCreator->getName() : "") . ""; $aDocumentTransaction = DocumentTransaction::getList("transaction_id=1 AND document_id=" . $aResults["documents"][$i]->getID()); @@ -357,7 +360,7 @@ function renderPage($aResults, $sBrowseType, $sSortBy, $sSortDirection, $bTempla $sToRender .= renderSortHeadings($sSortBy, $sSortDirection); $sToRender .= "\n"; switch ($sBrowseType) { - case "folder" : $sToRender .= renderFolderResults($aResults, $sSortBy, $sSortDirection, $bTemplateBrowsing); break; + case "folder" : $sToRender .= renderFolderResults($aResults, $bTemplateBrowsing); break; case "category" : $sToRender .= renderCategoryResults($aResults); break; case "documentType" : $sToRender .= renderDocumentTypeResults($aResults); break; } diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/documentUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/documentUI.inc index 8bfd32f..a592227 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/documentUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/documentUI.inc @@ -55,7 +55,8 @@ function displayDocumentLinkForTemplateBrowsing($oDocument, $bDisplayFullPath = $sIconUrl = $oDocument->getMimeTypeIconUrl(); $sIconPath = ($sIconUrl ? generateImage($sIconUrl) : generateImage("$default->graphicsUrl/unknown.gif")); - $sLinkText = $oDocument->getName(); + // #3425 the title is now the filename, and the description is the title + $sLinkText = $oDocument->getFileName(); if ($bDisplayFullPath) { // prepend folder path $sLinkText = Folder::getFolderDisplayPath($oDocument->getFolderID()) . " > " . $sLinkText; @@ -82,7 +83,8 @@ function displayDocumentLink($oDocument, $bDisplayFullPath = false) { $sIconUrl = $oDocument->getMimeTypeIconUrl(); $sIconPath = ($sIconUrl ? generateImage($sIconUrl) : generateImage("$default->graphicsUrl/unknown.gif")); - $sLinkText = $oDocument->getName(); + // #3425 the title is now the filename, and the description is the title + $sLinkText = $oDocument->getFileName(); if ($bDisplayFullPath) { // prepend folder path $sLinkText = Folder::getFolderDisplayPath($oDocument->getFolderID()) . " > " . $sLinkText;