Peter M. Groen / knowledgetree

Commit 37f36e9ab1dc828f6f9299ae35fb2be4c46244a4

Authored by Michael Joseph
1 parent 1baeefa8

added documentID to error pages, changed checkin to revision 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@1306 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 7 additions and 4 deletions
presentation/lookAndFeel/knowledgeTree/documentmanagement/documentUI.inc
  View file @37f36e9
@@ -63,10 +63,10 @@ function renderCheckInPage($oDocument) { @@ -63,10 +63,10 @@ function renderCheckInPage($oDocument) {
63 $sToRender .= "<tr><td><input type=\"hidden\" name=\"fForStore\" value=\"1\"/></td></tr>\n"; 63 $sToRender .= "<tr><td><input type=\"hidden\" name=\"fForStore\" value=\"1\"/></td></tr>\n";
64 $sToRender .= "<tr><td><input type=\"hidden\" name=\"fDocumentID\" value=\"" . $oDocument->getID() . "\"/></td></tr>\n"; 64 $sToRender .= "<tr><td><input type=\"hidden\" name=\"fDocumentID\" value=\"" . $oDocument->getID() . "\"/></td></tr>\n";
65 $sToRender .= "<tr><td>\n"; 65 $sToRender .= "<tr><td>\n";
66 - $sToRender .= "<input type=\"radio\" name=\"fCheckInType\" value=\"minor\" checked /> Minor CheckIn\n"; 66 + $sToRender .= "<input type=\"radio\" name=\"fCheckInType\" value=\"minor\" checked /> Minor Revision\n";
67 $sToRender .= "</tr></td>\n"; 67 $sToRender .= "</tr></td>\n";
68 $sToRender .= "<tr><td>\n"; 68 $sToRender .= "<tr><td>\n";
69 - $sToRender .= "<input type=\"radio\" name=\"fCheckInType\" value=\"major\"/> Major CheckIn\n"; 69 + $sToRender .= "<input type=\"radio\" name=\"fCheckInType\" value=\"major\"/> Major Revision\n";
70 $sToRender .= "</tr></td>\n"; 70 $sToRender .= "</tr></td>\n";
71 $sToRender .= "</table>\n"; 71 $sToRender .= "</table>\n";
72 72
@@ -108,9 +108,12 @@ function renderCheckOutPage($oDocument) { @@ -108,9 +108,12 @@ function renderCheckOutPage($oDocument) {
108 return $sToRender; 108 return $sToRender;
109 } 109 }
110 110
111 -function renderErrorPage($sErrorMessage) { 111 +function renderErrorPage($sErrorMessage, $iDocumentID = -1) {
112 global $default; 112 global $default;
113 return "<p class=\"errorText\">$sErrorMessage</p>\n" . 113 return "<p class=\"errorText\">$sErrorMessage</p>\n" .
114 - "<a href=\"javascript:history.go(-1)\"><img src=\"$default->graphicsUrl/widgets/back.gif\" border=\"0\"/></a>\n"; 114 + (($iDocumentID == -1) ?
  115 + "<a href=\"$default->rootUrl/control.php?action=viewDocument&fDocumentID=$iDocumentID\">" :
  116 + "<a href=\"javascript:history.go(-1)\">") .
  117 + "<img src=\"$default->graphicsUrl/widgets/back.gif\" border=\"0\"/></a>\n";
115 } 118 }
116 ?> 119 ?>