From 82fa496563e04a44e0ffb230a473d914b6807417 Mon Sep 17 00:00:00 2001 From: nbm Date: Wed, 16 Nov 2005 22:04:13 +0000 Subject: [PATCH] Get all related fieldsets using KTMetadataUtil::fieldsetsForDocument() --- presentation/lookAndFeel/knowledgeTree/documentmanagement/view.php | 30 +++++++----------------------- 1 file changed, 7 insertions(+), 23 deletions(-) diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/view.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/view.php index e681dc7..0754fcc 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/view.php +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/view.php @@ -141,28 +141,12 @@ class ViewDocumentDispatcher extends KTStandardDispatcher { // we always have a generic. array_push($fieldsets, new GenericFieldsetDisplay()); - // FIXME can we key this on fieldset namespace? or can we have duplicates? - // now we get the other fieldsets, IF there is a valid doctype. - if ($is_valid_doctype) { - // these are the _actual_ fieldsets. - $fieldsetDisplayReg =& KTFieldsetDisplayRegistry::getSingleton(); - // and the generics - $activesets = KTFieldset::getGenericFieldsets(); - foreach ($activesets as $oFieldset) { - $displayClass = $fieldsetDisplayReg->getHandler($oFieldset->getNamespace()); - array_push($fieldsets, new $displayClass($oFieldset)); - } - - $activesets = KTFieldset::getForDocumentType($oDocument->getDocumentTypeID()); - foreach ($activesets as $oFieldset) { - $displayClass = $fieldsetDisplayReg->getHandler($oFieldset->getNamespace()); - array_push($fieldsets, new $displayClass($oFieldset)); - } - - - } - - // FIXME handle ad-hoc fieldsets. + $fieldsetDisplayReg =& KTFieldsetDisplayRegistry::getSingleton(); + + foreach (KTMetadataUtil::fieldsetsForDocument($oDocument) as $oFieldset) { + $displayClass = $fieldsetDisplayReg->getHandler($oFieldset->getNamespace()); + array_push($fieldsets, new $displayClass($oFieldset)); + } $oTemplating = new KTTemplating; $oTemplate = $oTemplating->loadTemplate("kt3/view_document"); @@ -359,4 +343,4 @@ class ViewDocumentDispatcher extends KTStandardDispatcher { $oDispatcher = new ViewDocumentDispatcher; $oDispatcher->dispatch(); -?> \ No newline at end of file +?> -- libgit2 0.21.4