fix for KTS-715

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5166 c91229c3-7414-0410-bfa2-8a42b809f60b

fix for KTS-715
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5166 c91229c3-7414-0410-bfa2-8a42b809f60b
Brad Shuttleworth
1 parent 869d301b
Showing 3 changed files with 13 additions and 5 deletions
lib/metadata/metadatautil.inc.php
lib/widgets/fieldsetDisplay.inc.php
presentation/lookAndFeel/knowledgeTree/ajaxConditional.php
@@ -105,6 +105,14 @@ class KTMetadataUtil {
         }
         $GLOBALS['default']->log->debug('KTMetadataUtil::_getNextForBehaviour, final values are ' . print_r($aValues, true));
+        
+        // now we need to clean this up: remove no-value entries.
+        $temp = $aValues;
+        foreach ($temp as $k => $v) {
+            if (empty($v)) {
+                unset($aValues[$k]);
+            }
+        }
         return $aValues;
     }
     // }}}
@@ -560,12 +568,12 @@ class KTMetadataUtil {
             $aFields = DBUtil::getResultArrayKey($aQuery, 'field_id');
             $GLOBALS['default']->log->debug("   actual fields are " . print_r($aNextFields, true));
             foreach ($aNextFields as $iFieldId) {
-                if (!in_array($iFieldId, $aFields)) {
+                /*if (!in_array($iFieldId, $aFields)) {
                     $GLOBALS['default']->log->debug("   field $iFieldId is not included, failing");
                     $oChildField =& DocumentField::get($iFieldId);
                     $sChildFieldName = $oChildField->getName();
                     return PEAR::raiseError("Child field $sChildFieldName of parent field $sParentFieldName has no selectable values in behaviour $sBehaviourHumanName ($sBehaviourName)");
-                }
+                }*/
             }
         }
         $GLOBALS['default']->log->debug("Got through: passed!");
@@ -54,7 +54,7 @@ require_once(KT_LIB_DIR . &quot;/widgets/fieldWidgets.php&quot;);
 /* it may be useful to move this to a factory, eventually? */
-function getWidgetForMetadataField($field, $current_value, $page, $errors = null, $vocab = null) {
+function getWidgetForMetadataField($field, $current_value, $page, $errors = null, $vocab = null, $aOptions = null) {
     // all fields have these elements.
     $fieldLabel = $field->getName();
     $fieldDescription = $field->getDescription();
@@ -62,7 +62,7 @@ function getWidgetForMetadataField($field, $current_value, $page, $errors = null
     $fieldErrors = $errors; // array of strings
     $fieldName = 'metadata_' . $field->getID();
     $fieldOptions = array();
-    $fieldRequired = $field->getIsMandatory();
+    $fieldRequired = $field->getIsMandatory() || KTUtil::arrayGet($aOptions, 'required', false);
     if ($fieldRequired == 1) {
         $fieldRequired = true;
     }
@@ -84,7 +84,7 @@ class AjaxConditionalDispatcher extends KTStandardDispatcher {
             $vocab = array();
             $vocab[''] = 'Unset';
             foreach ($aFieldInfo['values'] as $md_v) { $vocab[$md_v->getName()] = $md_v->getName(); }
-            $oWidget = getWidgetForMetadataField($aFieldInfo['field'], null, $main, null, $vocab) ;
+            $oWidget = getWidgetForMetadataField($aFieldInfo['field'], null, $main, null, $vocab, array('required' => true)) ;
             $sWidgets .= $oWidget->render();
         }