Peter M. Groen / knowledgetree

Commit 8704358eace006fae24213cec2f596dfa9b41f67

Authored by Michael Joseph
1 parent 9d1d1932

fixed introduced bug- inline view on document filename reinstated 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@2778 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 5 additions and 4 deletions
presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc
  View file @8704358
@@ -36,11 +36,12 @@ function renderDocumentPath($oDocument, $bDisplayActions = false) { @@ -36,11 +36,12 @@ function renderDocumentPath($oDocument, $bDisplayActions = false) {
36 36
37 $sDocumentPath = displayFolderPathLink(Folder::getFolderPathAsArray($oDocument->getFolderID()), Folder::getFolderPathNamesAsArray($oDocument->getFolderID()), "$default->rootUrl/control.php?action=browse") . " > "; 37 $sDocumentPath = displayFolderPathLink(Folder::getFolderPathAsArray($oDocument->getFolderID()), Folder::getFolderPathNamesAsArray($oDocument->getFolderID()), "$default->rootUrl/control.php?action=browse") . " > ";
38 // #3425 for consistency 38 // #3425 for consistency
39 - $sDocumentPath .= $oDocument->getFileName();  
40 - if ($bDisplayActions) {  
41 - $sDocumentPath = "<a onClick=\"alert('This will view a copy of the current version of this document in the DMS. Any changes to this file will not be managed in the DMS.'); return true;\" href=\"" . generateControllerUrl("downloadDocument", "fDocumentID=" . $oDocument->getID() . "&fForInlineView=1") . "\">" . $sDocumentPath . "</a>"; 39 + if ($bDisplayActions) {
  40 + $sDocumentPath .= "<a onClick=\"alert('This will view a copy of the current version of this document in the DMS. Any changes to this file will not be managed in the DMS.'); return true;\" href=\"" . generateControllerUrl("downloadDocument", "fDocumentID=" . $oDocument->getID() . "&fForInlineView=1") . "\">" . $oDocument->getFileName() . "</a>";
  41 + } else {
  42 + $sDocumentPath .= $oDocument->getFileName();
42 } 43 }
43 - return "<table border=\"0\" cellpadding=\"5\" width=\"610\"><tr bgcolor=\"$sTDBGColour\"><td width=\"87%\">$sDocumentPath</td>" . ($bDisplayActions ? "<td width=\"15%\" align=\"center\" valign=\"middle\"><strong>Actions</strong></td>" : "") . "</tr></table>\n"; 44 + return "<table border=\"0\" cellpadding=\"5\" width=\"610\"><tr bgcolor=\"$sTDBGColour\"><td width=\"87%\">" . $sDocumentPath . "</td>" . ($bDisplayActions ? "<td width=\"15%\" align=\"center\" valign=\"middle\"><strong>Actions</strong></td>" : "") . "</tr></table>\n";
44 } 45 }
45 46
46 function renderDocumentData($oDocument, $bEditable, $sStatusMessage = "") { 47 function renderDocumentData($oDocument, $bEditable, $sStatusMessage = "") {