Peter M. Groen / knowledgetree

Commit 563adb4dd990addbc874537e48647c76da52c45a

Authored by Michael Joseph
1 parent d6eb2f0f

changed links to use getControllerLink function and incorporated showing a parti… 

…cular section on the document details page
changed document transaction listbox query to select transactions by name instead of id


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@2213 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 6 additions and 6 deletions
presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/archiveSettingsUI.inc
  View file @563adb4
@@ -25,7 +25,7 @@ function renderErrorMessage($sErrorMessage) { @@ -25,7 +25,7 @@ function renderErrorMessage($sErrorMessage) {
25 function renderDocumentTransactionListBox($iDocumentTransactionID) { 25 function renderDocumentTransactionListBox($iDocumentTransactionID) {
26 global $default; 26 global $default;
27 $oPatternListBox = & new PatternListBox($default->owl_transaction_types_table, "name", "id", "fDocumentTransactionID"); 27 $oPatternListBox = & new PatternListBox($default->owl_transaction_types_table, "name", "id", "fDocumentTransactionID");
28 - $oPatternListBox->setWhereClause("ST.id in (6,10)"); 28 + $oPatternListBox->setWhereClause("ST.name in ('View','Download')");
29 if (isset($iDocumentTransactionID)) { 29 if (isset($iDocumentTransactionID)) {
30 $oPatternListBox->setSelectedValue($iDocumentTransactionID); 30 $oPatternListBox->setSelectedValue($iDocumentTransactionID);
31 } 31 }
@@ -57,7 +57,7 @@ function renderChooseArchivingTypeForm() { @@ -57,7 +57,7 @@ function renderChooseArchivingTypeForm() {
57 $sToRender .= "<tr><td>Archiving Type:</td><td>" . renderArchivingTypeListBox() . "</td></tr>"; 57 $sToRender .= "<tr><td>Archiving Type:</td><td>" . renderArchivingTypeListBox() . "</td></tr>";
58 // hidden archive settings references 58 // hidden archive settings references
59 $sToRender .= "<input type=\"hidden\" name=\"fDocumentID\" value=\"$fDocumentID\">\n"; 59 $sToRender .= "<input type=\"hidden\" name=\"fDocumentID\" value=\"$fDocumentID\">\n";
60 - $sToRender .= "<tr><td><a href=\"$default->rootUrl/control.php?action=viewDocument&fDocumentID=$fDocumentID\"><img src=\"$default->graphicsUrl/widgets/cancel.gif\" border=\"0\" /></a></td></tr>\n"; 60 + $sToRender .= "<tr><td>" . generateControllerLink("viewDocument", "fDocumentID=$fDocumentID&fShowSection=archiveSettings", "<img src=\"$default->graphicsUrl/widgets/cancel.gif\" border=\"0\" />") . "</td></tr>\n";
61 $sToRender .= "</table>"; 61 $sToRender .= "</table>";
62 return $sToRender; 62 return $sToRender;
63 } 63 }
@@ -192,12 +192,12 @@ function renderArchiveSettingsForm($oDocumentArchiving = null) { @@ -192,12 +192,12 @@ function renderArchiveSettingsForm($oDocumentArchiving = null) {
192 $sToRender .= "<input type=\"hidden\" name=\"fStore\" value=\"1\">\n"; 192 $sToRender .= "<input type=\"hidden\" name=\"fStore\" value=\"1\">\n";
193 if ($oDocumentArchiving) { 193 if ($oDocumentArchiving) {
194 $sToRender .= "<tr><td colspan=\"2\"><input type=\"image\" src=\"$default->graphicsUrl/widgets/update.gif\" border=\"0\">\n"; 194 $sToRender .= "<tr><td colspan=\"2\"><input type=\"image\" src=\"$default->graphicsUrl/widgets/update.gif\" border=\"0\">\n";
195 - $sToRender .= "<a href=\"$default->rootUrl/control.php?action=modifyDocumentArchiveSettings&fDocumentID=$fDocumentID&fDelete=1\"><img src=\"$default->graphicsUrl/widgets/remove.gif\" border=\"0\" /></a>\n"; 195 + $sToRender .= generateControllerLink("modifyDocumentArchiveSettings", "fDocumentID=$fDocumentID&fDelete=1", "<img src=\"$default->graphicsUrl/widgets/remove.gif\" border=\"0\"/>");
196 } else { 196 } else {
197 $sToRender .= "<tr><td colspan=\"2\"><input type=\"image\" src=\"$default->graphicsUrl/widgets/submit.gif\" border=\"0\">\n"; 197 $sToRender .= "<tr><td colspan=\"2\"><input type=\"image\" src=\"$default->graphicsUrl/widgets/submit.gif\" border=\"0\">\n";
198 - $sToRender .= "<a href=\"$default->rootUrl/control.php?action=addDocumentArchiveSettings&fDocumentID=$fDocumentID\"><img src=\"$default->graphicsUrl/widgets/back.gif\" border=\"0\"></a>\n"; 198 + $sToRender .= generateControllerLink("addDocumentArchiveSettings", "fDocumentID=$fDocumentID", "<img src=\"$default->graphicsUrl/widgets/back.gif\" border=\"0\">");
199 } 199 }
200 - $sToRender .= "<a href=\"$default->rootUrl/control.php?action=viewDocument&fDocumentID=$fDocumentID\"><img src=\"$default->graphicsUrl/widgets/cancel.gif\" border=\"0\" /></a></td></tr>\n"; 200 + $sToRender .= generateControllerLink("viewDocument", "fDocumentID=$fDocumentID&fShowSection=archiveSettings", "<img src=\"$default->graphicsUrl/widgets/cancel.gif\" border=\"0\" />") . "</td></tr>\n";
201 $sToRender .= "</table>"; 201 $sToRender .= "</table>";
202 202
203 return $sToRender; 203 return $sToRender;
@@ -261,7 +261,7 @@ function renderArchiveConfirmationPage($iDocumentID, $sErrorMessage = &quot;&quot;) { @@ -261,7 +261,7 @@ function renderArchiveConfirmationPage($iDocumentID, $sErrorMessage = &quot;&quot;) {
261 $sToRender .= "<tr>\n"; 261 $sToRender .= "<tr>\n";
262 $sToRender .= "<td>&nbsp</td>\n"; 262 $sToRender .= "<td>&nbsp</td>\n";
263 $sToRender .= "<tr>\n"; 263 $sToRender .= "<tr>\n";
264 - $sToRender .= "<td><table><tr><td><a href=\"" . $_SERVER["PHP_SELF"] . "?fDocumentID=$iDocumentID&fConfirmed=1\"><img src=\"$default->graphicsUrl/widgets/archive.gif\" border=\"0\"></a></td> <td><a href=\"$default->rootUrl/control.php?action=viewDocument&fDocumentID=" . $iDocumentID . "\"><img src=\"$default->graphicsUrl/widgets/cancel.gif\" border=\"0\"></a></td></tr></table></td>"; 264 + $sToRender .= "<td><table><tr><td><a href=\"" . $_SERVER["PHP_SELF"] . "?fDocumentID=$iDocumentID&fConfirmed=1\"><img src=\"$default->graphicsUrl/widgets/archive.gif\" border=\"0\"></a></td><td>" . generateControllerLink("viewDocument", "fDocumentID=$iDocumentID&fShowSection=archiveSettings", "<img src=\"$default->graphicsUrl/widgets/cancel.gif\" border=\"0\">") . "</td></tr></table></td>";
265 $sToRender .= "</tr>"; 265 $sToRender .= "</tr>";
266 $sToRender .= "</table>\n"; 266 $sToRender .= "</table>\n";
267 267