Merge branch 'edge' of git@github.com:ktgit/knowledgetree into edge

Jarrett Jordaan
2 parents c56dd56c 8f7071c2
Showing 3 changed files with 16 additions and 15 deletions
lib/metadata/fieldsetregistry.inc.php
lib/widgets/forms.inc.php
presentation/lookAndFeel/knowledgeTree/documentmanagement/getTypeMetadataFields.php
@@ -139,26 +139,26 @@ class KTFieldsetRegistry {
         // FIXME delegate.
         $oFieldset =& $fieldsetOrType;
-            $widgets = array();
-            $fields = $oFieldset->getFields();
+        $widgets = array();
+        $fields = $oFieldset->getFields();
-    if ($oFieldset->getIsConditional()) {
-        $iMasterId = $oFieldset->getMasterFieldId();
+        if ($oFieldset->getIsConditional()) {
+            $iMasterId = $oFieldset->getMasterFieldId();
-        $oMasterField = DocumentField::get($iMasterId);
+            $oMasterField = DocumentField::get($iMasterId);
-        $newfields = array();
-        $newfields[] = $oMasterField;
-        foreach($fields as $oField) {
-        if($oField->getId() != $iMasterId) {
-            $newfields[] = $oField;
-        }
-        }
+            $newfields = array();
+            $newfields[] = $oMasterField;
+            foreach($fields as $oField) {
+                if($oField->getId() != $iMasterId) {
+                    $newfields[] = $oField;
+                }
+            }
             foreach ($newfields as $oField) {
                 $fname = 'metadata_' . $oField->getId(); 
                 $value = null;
-                
+                    
                 if (!is_null($oDocument)) {
                     $oFL = DocumentFieldLink::getByDocumentAndField($oDocument, $oField);
                     if (!is_null($oFL) && (!PEAR::isError($oFL))) {
@@ -166,7 +166,7 @@ class KTFieldsetRegistry {
                     }
                 }
-        $widgets[] = $this->oWF->get('ktcore.widgets.conditionalselection', 
+                $widgets[] = $this->oWF->get('ktcore.widgets.conditionalselection', 
                          array(
                            'label' => $oField->getName(),
                            'required' => $oField->getIsMandatory(),
@@ -328,7 +328,7 @@ class KTForm {
         $aOldData = array();
         $aErrors = array();
         $old_data = KTUtil::arrayGet((array) $_SESSION['_kt_old_data'],
-            $this->_kt_form_name, array());
+                                     $this->_kt_form_name, array());
         if (KTUtil::arrayGet($old_data, 'identifier') == $this->sIdentifier) {
             $bUseOld = true;
             $aStoredData = (array) unserialize(KTUtil::arrayGet($old_data, 'data'));
@@ -44,6 +44,7 @@ require_once(KT_LIB_DIR . &#39;/metadata/fieldset.inc.php&#39;);
 require_once(KT_LIB_DIR . '/widgets/fieldsetDisplay.inc.php');
 require_once(KT_LIB_DIR . "/widgets/fieldWidgets.php");
+require_once(KT_LIB_DIR . "/widgets/forms.inc.php");
 require_once(KT_LIB_DIR . "/metadata/fieldsetregistry.inc.php");
 require_once(KT_LIB_DIR . "/widgets/widgetfactory.inc.php");