Peter M. Groen / knowledgetree

Commit ae02a1cc63e726d894696a557d0016e41d977f55

Authored by Neil Blakey-Milner
1 parent 360d8727

Avoid using javascript:go(-1), instead pass returning IDs. 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@3346 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 3 changed files with 15 additions and 1 deletions
presentation/lookAndFeel/knowledgeTree/documentmanagement/browseBL.php
  View file @ae02a1c
@@ -64,15 +64,18 @@ if (isset($fActions)) { @@ -64,15 +64,18 @@ if (isset($fActions)) {
64 $sQueryString .= "fDocumentIDs[]=$fDocumentID&"; 64 $sQueryString .= "fDocumentIDs[]=$fDocumentID&";
65 } 65 }
66 } 66 }
  67 + $sQueryString .= "fReturnFolderID=$fFolderID&";
67 68
68 switch ($fActions) { 69 switch ($fActions) {
69 case "delete": 70 case "delete":
70 // delete all selected docs 71 // delete all selected docs
71 controllerRedirect("deleteDocument", $sQueryString); 72 controllerRedirect("deleteDocument", $sQueryString);
  73 + exit(0);
72 break; 74 break;
73 case "move": 75 case "move":
74 // Move selected docs to root folder 76 // Move selected docs to root folder
75 controllerRedirect("moveDocument", $sQueryString . "fFolderID=1"); 77 controllerRedirect("moveDocument", $sQueryString . "fFolderID=1");
  78 + exit(0);
76 break; 79 break;
77 } 80 }
78 } 81 }
presentation/lookAndFeel/knowledgeTree/documentmanagement/deleteDocumentUI.inc
  View file @ae02a1c
@@ -44,7 +44,17 @@ function getPage($aDocumentIDs) { @@ -44,7 +44,17 @@ function getPage($aDocumentIDs) {
44 $sToRender .= "<tr>\n"; 44 $sToRender .= "<tr>\n";
45 $sToRender .= "<td>&nbsp</td>\n"; 45 $sToRender .= "<td>&nbsp</td>\n";
46 $sToRender .= "<tr>\n"; 46 $sToRender .= "<tr>\n";
47 - $sToRender .= "<td><table><tr><td><a href=\"" . $_SERVER["PHP_SELF"] . "?$sQueryString&fDeleteConfirmed=1\"><img src=\"" . KTHtml::getDeleteButton() . "\" border=\"0\"></a></td> <td><a href=\"javascript:history.go(-1)\"><img src=\"" . KTHtml::getCancelButton() . "\" border=\"0\"></a></td></tr></table></td>"; 47 + $sToRender .= "<td><table><tr><td>";
  48 + $sToRender .= "<a href=\"" . $_SERVER["PHP_SELF"] . "?$sQueryString&fDeleteConfirmed=1\"><img src=\"" . KTHtml::getDeleteButton() . "\" border=\"0\"></a>";
  49 + $sToRender .= "</td> <td>";
  50 + if (KTUtil::arrayGet($_REQUEST, "fReturnFolderID")) {
  51 + $sToRender .= generateControllerLink("browse", "fFolderID=" . $_REQUEST['fReturnFolderID'], "<img src=\"" . KTHtml::getCancelButton() . "\" border=\"0\"></a>");
  52 + } else if (KTUtil::arrayGet($_REQUEST, "fReturnDocumentID")) {
  53 + $sToRender .= generateControllerLink("viewDocument", "fDocumentID=" . $_REQUEST['fReturnDocumentID'], "<img src=\"" . KTHtml::getCancelButton() . "\" border=\"0\"></a>");
  54 + } else {
  55 + $sToRender .= "<a href=\"javascript:history.go(-1)\"><img src=\"" . KTHtml::getCancelButton() . "\" border=\"0\"></a>";
  56 + }
  57 + $sToRender .= "</td></tr></table></td>";
48 $sToRender .= "</tr>"; 58 $sToRender .= "</tr>";
49 $sToRender .= "</table>\n"; 59 $sToRender .= "</table>\n";
50 60
presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc
  View file @ae02a1c
@@ -481,6 +481,7 @@ function displayEmailButton($oDocument) { @@ -481,6 +481,7 @@ function displayEmailButton($oDocument) {
481 function displayDeleteButton($oDocument, $bEdit) { 481 function displayDeleteButton($oDocument, $bEdit) {
482 if ($bEdit) { 482 if ($bEdit) {
483 $sQueryString = "fDocumentIDs[]=" . $oDocument->getID(); 483 $sQueryString = "fDocumentIDs[]=" . $oDocument->getID();
  484 + $sQueryString .= "&fReturnDocumentID=" . $oDocument->getID();
484 if ($oDocument->getIsCheckedOut()) { 485 if ($oDocument->getIsCheckedOut()) {
485 $sDisabledText = _("This document can't be deleted because its checked out"); 486 $sDisabledText = _("This document can't be deleted because its checked out");
486 } 487 }