Peter M. Groen / knowledgetree

Commit 4b47d4a85a0778567af851e3a0079d4ab8b2d320

Authored by rob
1 parent 26ec9455

Made renderFolder function more general 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@603 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 11 additions and 4 deletions
presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderUI.inc
  View file @4b47d4a
@@ -9,15 +9,15 @@ @@ -9,15 +9,15 @@
9 * 9 *
10 */ 10 */
11 11
12 -function renderBrowseAddPage($fFolderID) { 12 +function renderBrowseAddPage($fFolderID) {
13 $sToRender = "<table border=\"0\">\n"; 13 $sToRender = "<table border=\"0\">\n";
14 $sToRender .= "<tr>\n"; 14 $sToRender .= "<tr>\n";
15 - $sToRender .= "\t<td>" . renderFolderPath($fFolderID) . "</td>\n"; 15 + $sToRender .= "\t<td>" . renderFolderPath($fFolderID, "$default->owl_ui_directory/foldermanagement/addFolderBL.php") . "</td>\n";
16 $sToRender .= "</tr>\n"; 16 $sToRender .= "</tr>\n";
17 $sToRender .= "</table>\n"; 17 $sToRender .= "</table>\n";
18 $sToRender .= "<table border=\"0\">\n"; 18 $sToRender .= "<table border=\"0\">\n";
19 $sToRender .= "<tr>\n"; 19 $sToRender .= "<tr>\n";
20 - $sToRender .= "\t<td>" . renderFolderList($fFolderID) . "<td>\n"; 20 + $sToRender .= "\t<td>" . renderFolderList($fFolderID, "control.php?action=addFolder") . "<td>\n";
21 $sToRender .= "</tr>\n"; 21 $sToRender .= "</tr>\n";
22 $sToRender .= "</table><br>\n"; 22 $sToRender .= "</table><br>\n";
23 $sToRender .= "<table border=\"1\">\n"; 23 $sToRender .= "<table border=\"1\">\n";
presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc
  View file @4b47d4a
@@ -63,6 +63,13 @@ function renderFolderPath($fFolderID) { @@ -63,6 +63,13 @@ function renderFolderPath($fFolderID) {
63 return "<table border=1 width = 100%><tr><td>$sFolderPath</td></tr></table>\n"; 63 return "<table border=1 width = 100%><tr><td>$sFolderPath</td></tr></table>\n";
64 } 64 }
65 65
  66 +/**
  67 +* Renders a the list of folders found in $fFolderID as
  68 +* and HTML table. &fFolderID=<folder_id> is automatically
  69 +* appended to the query string
  70 +*
  71 +* @return String HTML table
  72 +*/
66 function renderFolderList($fFolderID, $sLinkURL) { 73 function renderFolderList($fFolderID, $sLinkURL) {
67 global $default; 74 global $default;
68 $sQuery = "SELECT F.id AS id, F.name AS name " . 75 $sQuery = "SELECT F.id AS id, F.name AS name " .
@@ -73,7 +80,7 @@ function renderFolderList($fFolderID, $sLinkURL) { @@ -73,7 +80,7 @@ function renderFolderList($fFolderID, $sLinkURL) {
73 $aColumnTypes = array(3); 80 $aColumnTypes = array(3);
74 $aColumnHeaderNames = array("Folder"); 81 $aColumnHeaderNames = array("Folder");
75 82
76 - $oPatternTableSqlQuery = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnHeaderNames, "100%", "$default->owl_root_url/$sLinkURL", "id"); 83 + $oPatternTableSqlQuery = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnHeaderNames, "100%", "$default->owl_root_url/$sLinkURL&fFolderID=", "id");
77 $oPatternTableSqlQuery->setImageURL("$default->owl_fs_root/graphics/widgets/dfolder.gif"); 84 $oPatternTableSqlQuery->setImageURL("$default->owl_fs_root/graphics/widgets/dfolder.gif");
78 $oPatternTableSqlQuery->setEmptyTableMessage("This folder contains no sub folders"); 85 $oPatternTableSqlQuery->setEmptyTableMessage("This folder contains no sub folders");
79 return $oPatternTableSqlQuery->render(); 86 return $oPatternTableSqlQuery->render();