From e35b1b82701e68fd11693e569f032575ce765a1f Mon Sep 17 00:00:00 2001 From: nbm Date: Tue, 15 Nov 2005 14:11:00 +0000 Subject: [PATCH] Be able to create system fieldsets, and also use nameToLocalNamespace so that users don't have to figure out what a namespace is to create a fieldset. --- presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/documentFields.php | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/documentFields.php b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/documentFields.php index 0b75668..26fe079 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/documentFields.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/documentFields.php @@ -62,17 +62,31 @@ class KTDocumentFieldDispatcher extends KTStandardDispatcher { // {{{ do_new function do_new() { + $bIsGeneric = false; + $bIsSystem = false; + if (KTUtil::arrayGet($_REQUEST, 'generic')) { - $generic = true; - } else { - $generic = false; + $bIsGeneric = true; + } + + if (KTUtil::arrayGet($_REQUEST, 'system')) { + $bIsSystem = true; + // Can't be a system fieldset and a generic fieldset... + $bIsGeneric = false; + } + $sName = KTUtil::arrayGet($_REQUEST, 'name'); + $sName = $this->oValidator->notEmpty($sName); + $sNamespace = KTUtil::arrayGet($_REQUEST, 'namespace'); + if (empty($sNamespace)) { + $sNamespace = KTUtil::nameToLocalNamespace('fieldsets', $sName); } $res = KTFieldset::createFromArray(array( - 'name' => $_REQUEST['name'], - 'namespace' => $_REQUEST['namespace'], + 'name' => $sName, + 'namespace' => $sNamespace, 'mandatory' => false, 'isconditional' => false, - 'isgeneric' => $generic, + 'isgeneric' => $bIsGeneric, + 'issystem' => $bIsSystem, )); if (PEAR::isError($res) || ($res === false)) { $this->errorRedirectToMain('Could not create fieldset'); -- libgit2 0.21.4