From d2d4909deeb33c5a4351d2f349027a4a26fee614 Mon Sep 17 00:00:00 2001 From: nbm Date: Thu, 29 Sep 2005 11:37:52 +0000 Subject: [PATCH] Be aware that folders may not have any document type restrictions, and simplify the display of the document types that are allowed. --- presentation/lookAndFeel/knowledgeTree/foldermanagement/editUI.inc | 50 ++++++++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 22 deletions(-) diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/editUI.inc b/presentation/lookAndFeel/knowledgeTree/foldermanagement/editUI.inc index 1d42582..1b1747f 100644 --- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/editUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/editUI.inc @@ -1,5 +1,4 @@ fileSystemRoot/lib/documentmanagement/Document.inc"); /** * $Id$ * @@ -26,6 +25,9 @@ require_once("$default->fileSystemRoot/lib/documentmanagement/Document.inc"); * @package foldermanagement */ +require_once("$default->fileSystemRoot/lib/documentmanagement/Document.inc"); +require_once(KT_LIB_DIR . '/documentmanagement/DocumentType.inc'); + function getFolderPath($iFolderID) { global $default; global $default; @@ -105,27 +107,31 @@ function getFolderRouting($iFolderID, $sDivName, $bCollaboration) { } function getFolderDocTypes($iFolderID, $sDivName) { - global $default; - /*ok*/ $sQuery = array("SELECT FDL.id, FDL.folder_id, FDL.document_type_id, DTL.name, 'Remove' AS del " . - "FROM $default->folder_doctypes_table AS FDL INNER JOIN $default->document_types_table AS DTL ON FDL.document_type_id = DTL.id " . - "WHERE FDL.folder_id = ? " . - "ORDER BY DTL.name ASC", $iFolderID); - - $aColumns = array("name", "del"); - $aColumnHeaders = array("",""); - $aColumnTypes = array(1,3,3); - $aDBColumnArray = array("id","folder_id"); - $aQueryStringVariableNames = array("fFolderDocTypeID", "fFolderID"); - $aLinkURLs = array(1=>"$default->rootUrl/control.php?action=deleteFolderDocType"); - - $oPatternTableSqlQuery = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnHeaders, "610", $aLinkURLs, $aDBColumnArray,$aQueryStringVariableNames); - $oPatternTableSqlQuery->setTableHeading(_("Document Types")); - $oPatternTableSqlQuery->setDisplayColumnHeadings(true); - - $sToRender .= ""; - $sToRender .= ""; - $sToRender .= ""; - $sToRender .= "
" . $oPatternTableSqlQuery->render() . "
rootUrl/control.php?action=addFolderDocType&fFolderID=$iFolderID\">
"; + $sTable = KTUtil::getTableName('folder_doctypes'); + $aQuery = array( + "SELECT document_type_id FROM $sTable WHERE folder_id = ?", + array($iFolderID), + ); + $aSelectedIds = DBUtil::getResultArrayKey($aQuery, 'document_type_id'); + + $sToRender = '

Document Types

'; + + $oFolder =& Folder::get($iFolderID); + if ($oFolder->getRestrictDocumentTypes()) { + $sToRender .= '

Document types are restricted to the following:

'; + $sToRender .= ''; + } else { + $sToRender .= '

Document types are not restricted on this folder

'; + } + $sToRender .= sprintf( + '', + $default->rootUrl, $iFolderID, KTHtml::getEditButton()); + return renderSectionDiv($sDivName, $sToRender); } -- libgit2 0.21.4