From 44d3710d28241bcf635115472b09d6464833bc82 Mon Sep 17 00:00:00 2001 From: Michael Joseph Date: Mon, 10 Nov 2003 15:04:19 +0000 Subject: [PATCH] #3425 display document.fileName in document browse paths for consistency --- presentation/lookAndFeel/knowledgeTree/documentmanagement/viewHistoryBL.php | 3 +++ presentation/lookAndFeel/knowledgeTree/documentmanagement/viewHistoryUI.inc | 10 +--------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewHistoryBL.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewHistoryBL.php index ebd0359..4a1295b 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewHistoryBL.php +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewHistoryBL.php @@ -42,10 +42,13 @@ require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc"); require_once("$default->fileSystemRoot/lib/visualpatterns/PatternTableSqlQuery.inc"); require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc"); +require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/documentmanagement/documentUI.inc"); + require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewHistoryUI.inc"); require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc"); require_once("$default->fileSystemRoot/presentation/Html.inc"); + if (checkSession()) { require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); if (isset($fDocumentID)) { diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewHistoryUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewHistoryUI.inc index c489aee..2782411 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewHistoryUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewHistoryUI.inc @@ -26,14 +26,6 @@ * @package documentmanagement */ -function getDocumentPath($iFolderID, $sDocumentName) { - global $default; - $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"]))); - $sTDBGColour = $default->siteMap->getSectionColour($sSectionName, "td"); - $sDocumentPath = displayFolderPathLink(Folder::getFolderPathAsArray($iFolderID), Folder::getFolderPathNamesAsArray($iFolderID), "$default->rootUrl/control.php?action=browse") . " > " . $sDocumentName; - return "
$sDocumentPath
\n"; -} - function getDocumentHistory($iDocumentID) { global $default; $sQuery = "SELECT DTT.name AS transaction_name, U.name AS user_name, DT.version AS version, DT.comment AS comment, DT.datetime AS datetime " . @@ -83,7 +75,7 @@ function getPage($iDocumentID, $iFolderID, $sDocumentName) { $sToRender = renderHeading("Document History"); $sToRender .= "\n"; $sToRender .= "\n"; - $sToRender .= "\n"; + $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "
" . getDocumentPath($iFolderID, $sDocumentName) . "" . displayDocumentPath($iDocumentID) . "
\n"; $sToRender .= "\n"; -- libgit2 0.21.4