Peter M. Groen / knowledgetree

Commit ffa507e80d624f427b32ad2d675706283a481ec6

Authored by michael
1 parent c9fd717e

corrected checkout / download bug (#2672) 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@2258 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 6 additions and 1 deletions
presentation/lookAndFeel/knowledgeTree/documentmanagement/checkOutDocumentUI.inc
  View file @ffa507e
... ... @@ -52,7 +52,7 @@ function getCheckOutPage($oDocument, $bCheckedOut = false) {
52 52 if ($bCheckedOut) {
53 53 $sToRender .= "<table>";
54 54 $sToRender .= "<tr><td>You have now checked out this document. No one else can make updates to the document while you have it checked out. Click the Download button to get the latest version of the file. Please check it back in, as soon as you finish working on it.</td></tr>\n";
55   - $sToRender .= "<tr><td><a href=\"$default->rootUrl/control.php?action=viewDocument&fDocumentID=" . $oDocument->getID() . "&fForDownload=1\"><img src=\"$default->graphicsUrl/widgets/download.gif\" border=\"0\" /></a>\n";
  55 + $sToRender .= "<tr><td><a href=\"$default->rootUrl/control.php?action=downloadDocument&fDocumentID=" . $oDocument->getID() . "\"><img src=\"$default->graphicsUrl/widgets/download.gif\" border=\"0\" /></a>\n";
56 56 $sToRender .= "<a href=\"$default->rootUrl/control.php?action=viewDocument&fDocumentID=" . $oDocument->getID() . "\"><img src=\"$default->graphicsUrl/widgets/back.gif\" border=\"0\" /></a></td>\n";
57 57 $sToRender .= "</table>";
58 58 } else {
... ...
presentation/lookAndFeel/knowledgeTree/documentmanagement/downloadBL.php
  View file @ffa507e
... ... @@ -49,6 +49,11 @@ if (checkSession()) {
49 49 $oDocumentTransaction->create();
50 50 PhysicalDocumentManager::downloadPhysicalDocument($fDocumentID);
51 51 }
  52 +
  53 + // optionally redirect to some other page
  54 +// if ($fForDownload) {
  55 +// $sOnLoadJs = "redirTimer(0, '" . generateControllerUrl("downloadDocument", "fDocumentID=$fDocumentID") ."');";
  56 +// }
52 57 }
53 58 } else {
54 59 require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
... ...