From 266868fee986f78a726feef99330b965866e1028 Mon Sep 17 00:00:00 2001
From: Megan Watson <megan@knowledgetree.com>
Date: Wed, 13 Feb 2008 13:51:30 +0000
Subject: [PATCH] KTS-2391 "When changing doc type the old associated fieldsets should be removed" Fixed. Incremented the metadata version and copied the metadata for the fieldsets that remain with the new doc type.

---
 plugins/ktcore/document/edit.php | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------
 1 file changed, 54 insertions(+), 46 deletions(-)

diff --git a/plugins/ktcore/document/edit.php b/plugins/ktcore/document/edit.php
index c9f7c48..af0cdc8 100644
--- a/plugins/ktcore/document/edit.php
+++ b/plugins/ktcore/document/edit.php
@@ -294,68 +294,76 @@ class KTDocumentEditAction extends KTDocumentAction {
         }
 
         $document_type = $data['type'];
+        $doctypeid = $document_type->getId();
 
+        // Get the current document type, fieldsets and metadata
+        $iOldDocTypeID = $this->oDocument->getDocumentTypeID();
+        $fieldsets = KTMetadataUtil::fieldsetsForDocument($this->oDocument, $iOldDocTypeID);
+        $mdlist = DocumentFieldLink::getByDocument($this->oDocument);
 
-    	$doctypeid = $document_type->getId();
-
-
-    	DBUtil::startTransaction();
-    	$this->oDocument->setDocumentTypeId($doctypeid);
-    	$res = $this->oDocument->update();
+        $field_values = array();
+        foreach ($mdlist as $oFieldLink) {
+            $field_values[$oFieldLink->getDocumentFieldID()] = $oFieldLink->getValue();
+        }
 
+        DBUtil::startTransaction();
 
-    	if (PEAR::isError($res))
-    	{
-    		DBUtil::rollback();
-    		return $res;
-    	}
-    	DBUtil::commit();
+        // Update the document with the new document type id
+        $this->oDocument->startNewMetadataVersion($this->oUser);
+        $this->oDocument->setDocumentTypeId($doctypeid);
+        $res = $this->oDocument->update();
 
-    	$fieldsets = KTMetadataUtil::fieldsetsForDocument($this->oDocument, $doctypeid);
+        if (PEAR::isError($res))
+        {
+            DBUtil::rollback();
+            return $res;
+        }
 
-    	$fs_ids = array();
+        // Ensure all values for fieldsets common to both document types are retained
+        $fs_ids = array();
 
-    	$doctype_fieldsets = KTFieldSet::getForDocumentType($doctypeid);
-    	foreach($doctype_fieldsets as $fieldset)
-    	{
-    		$fs_ids[] = $fieldset->getId();
-    	}
-    	$MDPack = array();
-    	foreach ($fieldsets as $oFieldset)
-    	{
-    		if ($oFieldset->getIsGeneric() || in_array($oFieldset->getId(),$fs_ids))
-    		{
-    			//print $oFieldset->getName() . "<br>";
-    			$fields = $oFieldset->getFields();
-    			$values = (array) KTUtil::arrayGet($data, 'fieldset_' . $oFieldset->getId());
-    			foreach ($fields as $oField)
-    			{
-    				$val = KTUtil::arrayGet($values, 'metadata_' . $oField->getId());
+        $doctype_fieldsets = KTFieldSet::getForDocumentType($doctypeid);
+        foreach($doctype_fieldsets as $fieldset)
+        {
+            $fs_ids[] = $fieldset->getId();
+        }
 
-    				// FIXME "null" has strange meanings here.
-    				if (!is_null($val))
-    				{
-    					$MDPack[] = array(
-    					$oField,
-    					$val
-    					);
-    				}
-    			}
-    		}
+        $MDPack = array();
+        foreach ($fieldsets as $oFieldset)
+        {
+            if ($oFieldset->getIsGeneric() || in_array($oFieldset->getId(), $fs_ids))
+            {
+                $fields = $oFieldset->getFields();
+
+                foreach ($fields as $oField)
+                {
+                    $val = isset($field_values[$oField->getId()]) ? $field_values[$oField->getId()] : '';
+
+                    if (!empty($val))
+                    {
+                        $MDPack[] = array($oField, $val);
+                    }
+                }
+            }
+        }
 
-    	}
+        $core_res = KTDocumentUtil::saveMetadata($this->oDocument, $MDPack, array('novalidate' => true));
 
-    	 $core_res = KTDocumentUtil::saveMetadata($this->oDocument, $MDPack);
+        if (PEAR::isError($core_res)) {
+            DBUtil::rollback();
+            return $core_res;
+        }
+        DBUtil::commit();
 
-    	 $oKTTriggerRegistry = KTTriggerRegistry::getSingleton();
+        $oKTTriggerRegistry = KTTriggerRegistry::getSingleton();
         $aTriggers = $oKTTriggerRegistry->getTriggers('edit', 'postValidate');
 
         foreach ($aTriggers as $aTrigger) {
             $sTrigger = $aTrigger[0];
             $oTrigger = new $sTrigger;
             $aInfo = array(
-                "document" => $this->oDocument,
-                "aOptions" => $MDPack,
+            "document" => $this->oDocument,
+            "aOptions" => $MDPack,
             );
             $oTrigger->setInfo($aInfo);
             $ret = $oTrigger->postValidate();
@@ -366,4 +374,4 @@ class KTDocumentEditAction extends KTDocumentAction {
 }
 // }}}
 
-?>
+?>
\ No newline at end of file
--
libgit2 0.21.4