diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderUI.inc b/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderUI.inc index e093aa1..9b83304 100644 --- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderUI.inc @@ -9,15 +9,15 @@ * */ -function renderBrowseAddPage($fFolderID) { +function renderBrowseAddPage($fFolderID) { $sToRender = "\n"; $sToRender .= "\n"; - $sToRender .= "\t\n"; + $sToRender .= "\t\n"; $sToRender .= "\n"; $sToRender .= "
" . renderFolderPath($fFolderID) . "" . renderFolderPath($fFolderID, "$default->owl_ui_directory/foldermanagement/addFolderBL.php") . "
\n"; $sToRender .= "\n"; $sToRender .= "\n"; - $sToRender .= "\t\n"; $sToRender .= "
" . renderFolderList($fFolderID) . "\n"; + $sToRender .= "\t" . renderFolderList($fFolderID, "control.php?action=addFolder") . "\n"; $sToRender .= "

\n"; $sToRender .= "\n"; diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc b/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc index 587c6b4..5e13e8d 100644 --- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc @@ -63,6 +63,13 @@ function renderFolderPath($fFolderID) { return "
$sFolderPath
\n"; } +/** +* Renders a the list of folders found in $fFolderID as +* and HTML table. &fFolderID= is automatically +* appended to the query string +* +* @return String HTML table +*/ function renderFolderList($fFolderID, $sLinkURL) { global $default; $sQuery = "SELECT F.id AS id, F.name AS name " . @@ -73,7 +80,7 @@ function renderFolderList($fFolderID, $sLinkURL) { $aColumnTypes = array(3); $aColumnHeaderNames = array("Folder"); - $oPatternTableSqlQuery = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnHeaderNames, "100%", "$default->owl_root_url/$sLinkURL", "id"); + $oPatternTableSqlQuery = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnHeaderNames, "100%", "$default->owl_root_url/$sLinkURL&fFolderID=", "id"); $oPatternTableSqlQuery->setImageURL("$default->owl_fs_root/graphics/widgets/dfolder.gif"); $oPatternTableSqlQuery->setEmptyTableMessage("This folder contains no sub folders"); return $oPatternTableSqlQuery->render();