From f449acef0e5b463eb9d068f2f48aed2f2d990c0c Mon Sep 17 00:00:00 2001
From: Charl Joseph Mert <charl@knowledgetree.com>
Date: Wed, 28 Oct 2009 11:13:56 +0200
Subject: [PATCH] When doing a Bulk Upload the Large Text Field is not available as MCE. Jira:KTC-810

---
 lib/metadata/fieldsetregistry.inc.php                                       |  2 +-
 presentation/lookAndFeel/knowledgeTree/documentmanagement/getHtmlFields.php |  9 ++++-----
 resources/js/kt_bulkupload.js                                               | 11 ++++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/metadata/fieldsetregistry.inc.php b/lib/metadata/fieldsetregistry.inc.php
index 99849d3..ab78767 100755
--- a/lib/metadata/fieldsetregistry.inc.php
+++ b/lib/metadata/fieldsetregistry.inc.php
@@ -111,7 +111,7 @@ class KTFieldsetRegistry {
      */
     function getGenericFields($oFieldset, $idPre = 'metadata_') {
     	//return false if this isn't a generic fieldset
-    	if ($oFieldset->getIsGeneric()) {
+    	if (!$oFieldset->getIsGeneric()) {
     		return false;
     	}
     	
diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/getHtmlFields.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/getHtmlFields.php
index 6aec84c..02b96df 100755
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/getHtmlFields.php
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/getHtmlFields.php
@@ -101,20 +101,19 @@ class GetHtmlFieldsDispatcher extends KTDispatcher {
 
 	/**
 	 * Returns a JSON object containing a list of fields belonging to a generic fieldset 
-	 * for the given DocumentId
 	 * @return JSON Object
 	 *
 	 */
-	function getGenericFields($iDocumentTypeID) {
+	function getGenericFields() {
 		$oFReg =& KTFieldsetRegistry::getSingleton();
-		$activesets = KTFieldset::getForDocumentType($iDocumentTypeID);
+		$activesets = KTFieldset::getGenericFieldsets();
 		
 		$fields = array();
 		foreach ($activesets as $oFieldset) {
-			$fieldIds = kt_array_merge($fields, $oFReg->getGenericFields($oFieldset));
+			$fieldIds = kt_array_merge($fieldIds, $oFReg->getGenericFields($oFieldset));
 		}
 		
-		$jsOptions = '{ "htmlId" : {';
+		$jsOptions = '{ "genericId" : {';
 		
 		foreach($fieldIds as $fieldId) {
 			$jsOptions .= "'$fieldId' : '$fieldId',";
diff --git a/resources/js/kt_bulkupload.js b/resources/js/kt_bulkupload.js
index 1ef42c7..ae181e4 100755
--- a/resources/js/kt_bulkupload.js
+++ b/resources/js/kt_bulkupload.js
@@ -19,22 +19,23 @@ function swapInItem(docId, elementId, req) {
     //Need to compare against fields from generic fieldsets to 
     //prevent duplicate date field instanciation.
     var genericFields = '';
-    //Sample  { "htmlId" : {'metadata_7' : 'metadata_7','metadata_9' : 'metadata_9'}}
+    //Sample  { "genericId" : {'metadata_7' : 'metadata_7','metadata_9' : 'metadata_9'}}
     jQuery.getJSON('presentation/lookAndFeel/knowledgeTree/documentmanagement/getHtmlFields.php?fDocumentTypeID=' + docId + '&type=generic',
 	    function(json){
-        jQuery.each(json.htmlId, function(id) {
+        jQuery.each(json.genericId, function(id) {
         	//Building a list of generic fields  
             genericFields += id + ',';
 	    });
         
+        alert(genericFields);
+        
         var elems = jQuery(document).find(".kt_date_field");
     	for (i = 0; i < elems.length; i++) {
     		var fieldName = elems[i].id;
     		//alert(fieldName);
-    		isGeneric = true;
-    		
+    		isGeneric = false;
     		if (genericFields.indexOf(fieldName.match('metadata_[0-9]+')) >= 0){
-    			isGeneric = false;
+    			isGeneric = true;
     		}
     		
     		if (!isGeneric){
--
libgit2 0.21.4