Peter M. Groen / knowledgetree

Commit 44d3710d28241bcf635115472b09d6464833bc82

Authored by Michael Joseph
1 parent f2ad7493

#3425 display document.fileName in document browse paths for consistency 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@2775 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 4 additions and 9 deletions
presentation/lookAndFeel/knowledgeTree/documentmanagement/viewHistoryBL.php
  View file @44d3710
@@ -42,10 +42,13 @@ require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc"); @@ -42,10 +42,13 @@ require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
42 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternTableSqlQuery.inc"); 42 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternTableSqlQuery.inc");
43 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc"); 43 require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");
44 44
  45 +require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/documentmanagement/documentUI.inc");
  46 +
45 require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewHistoryUI.inc"); 47 require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewHistoryUI.inc");
46 require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc"); 48 require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
47 require_once("$default->fileSystemRoot/presentation/Html.inc"); 49 require_once("$default->fileSystemRoot/presentation/Html.inc");
48 50
  51 +
49 if (checkSession()) { 52 if (checkSession()) {
50 require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); 53 require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
51 if (isset($fDocumentID)) { 54 if (isset($fDocumentID)) {
presentation/lookAndFeel/knowledgeTree/documentmanagement/viewHistoryUI.inc
  View file @44d3710
@@ -26,14 +26,6 @@ @@ -26,14 +26,6 @@
26 * @package documentmanagement 26 * @package documentmanagement
27 */ 27 */
28 28
29 -function getDocumentPath($iFolderID, $sDocumentName) {  
30 - global $default;  
31 - $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"])));  
32 - $sTDBGColour = $default->siteMap->getSectionColour($sSectionName, "td");  
33 - $sDocumentPath = displayFolderPathLink(Folder::getFolderPathAsArray($iFolderID), Folder::getFolderPathNamesAsArray($iFolderID), "$default->rootUrl/control.php?action=browse") . " > " . $sDocumentName;  
34 - return "<table border=\"0\"cellpadding=\"5\" width=\"610\"><tr bgcolor=\"$sTDBGColour\"><td width=\"87%\">$sDocumentPath</td></tr></table>\n";  
35 -}  
36 -  
37 function getDocumentHistory($iDocumentID) { 29 function getDocumentHistory($iDocumentID) {
38 global $default; 30 global $default;
39 $sQuery = "SELECT DTT.name AS transaction_name, U.name AS user_name, DT.version AS version, DT.comment AS comment, DT.datetime AS datetime " . 31 $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) { @@ -83,7 +75,7 @@ function getPage($iDocumentID, $iFolderID, $sDocumentName) {
83 $sToRender = renderHeading("Document History"); 75 $sToRender = renderHeading("Document History");
84 $sToRender .= "<table>\n"; 76 $sToRender .= "<table>\n";
85 $sToRender .= "<tr>\n"; 77 $sToRender .= "<tr>\n";
86 - $sToRender .= "<td>" . getDocumentPath($iFolderID, $sDocumentName) . "</td>\n"; 78 + $sToRender .= "<td>" . displayDocumentPath($iDocumentID) . "</td>\n";
87 $sToRender .= "</tr>\n"; 79 $sToRender .= "</tr>\n";
88 $sToRender .= "</table>\n"; 80 $sToRender .= "</table>\n";
89 $sToRender .= "<table>\n"; 81 $sToRender .= "<table>\n";