Peter M. Groen / knowledgetree

Commit f449acef0e5b463eb9d068f2f48aed2f2d990c0c

Authored by Charl Joseph Mert
1 parent 37aaf544

When doing a Bulk Upload the Large Text Field is not available as MCE. 

Jira:KTC-810

Fixed generic fieldset JSON call to return the proper list of generic fields

Committed by: Charl Joseph Mert
Reviewed by: Megan Watson
Inline Side-by-side
Showing 3 changed files with 11 additions and 11 deletions
lib/metadata/fieldsetregistry.inc.php
  View file @f449ace
@@ -111,7 +111,7 @@ class KTFieldsetRegistry { @@ -111,7 +111,7 @@ class KTFieldsetRegistry {
111 */ 111 */
112 function getGenericFields($oFieldset, $idPre = 'metadata_') { 112 function getGenericFields($oFieldset, $idPre = 'metadata_') {
113 //return false if this isn't a generic fieldset 113 //return false if this isn't a generic fieldset
114 - if ($oFieldset->getIsGeneric()) { 114 + if (!$oFieldset->getIsGeneric()) {
115 return false; 115 return false;
116 } 116 }
117 117
presentation/lookAndFeel/knowledgeTree/documentmanagement/getHtmlFields.php
  View file @f449ace
@@ -101,20 +101,19 @@ class GetHtmlFieldsDispatcher extends KTDispatcher { @@ -101,20 +101,19 @@ class GetHtmlFieldsDispatcher extends KTDispatcher {
101 101
102 /** 102 /**
103 * Returns a JSON object containing a list of fields belonging to a generic fieldset 103 * Returns a JSON object containing a list of fields belonging to a generic fieldset
104 - * for the given DocumentId  
105 * @return JSON Object 104 * @return JSON Object
106 * 105 *
107 */ 106 */
108 - function getGenericFields($iDocumentTypeID) { 107 + function getGenericFields() {
109 $oFReg =& KTFieldsetRegistry::getSingleton(); 108 $oFReg =& KTFieldsetRegistry::getSingleton();
110 - $activesets = KTFieldset::getForDocumentType($iDocumentTypeID); 109 + $activesets = KTFieldset::getGenericFieldsets();
111 110
112 $fields = array(); 111 $fields = array();
113 foreach ($activesets as $oFieldset) { 112 foreach ($activesets as $oFieldset) {
114 - $fieldIds = kt_array_merge($fields, $oFReg->getGenericFields($oFieldset)); 113 + $fieldIds = kt_array_merge($fieldIds, $oFReg->getGenericFields($oFieldset));
115 } 114 }
116 115
117 - $jsOptions = '{ "htmlId" : {'; 116 + $jsOptions = '{ "genericId" : {';
118 117
119 foreach($fieldIds as $fieldId) { 118 foreach($fieldIds as $fieldId) {
120 $jsOptions .= "'$fieldId' : '$fieldId',"; 119 $jsOptions .= "'$fieldId' : '$fieldId',";
resources/js/kt_bulkupload.js
  View file @f449ace
@@ -19,22 +19,23 @@ function swapInItem(docId, elementId, req) { @@ -19,22 +19,23 @@ function swapInItem(docId, elementId, req) {
19 //Need to compare against fields from generic fieldsets to 19 //Need to compare against fields from generic fieldsets to
20 //prevent duplicate date field instanciation. 20 //prevent duplicate date field instanciation.
21 var genericFields = ''; 21 var genericFields = '';
22 - //Sample { "htmlId" : {'metadata_7' : 'metadata_7','metadata_9' : 'metadata_9'}} 22 + //Sample { "genericId" : {'metadata_7' : 'metadata_7','metadata_9' : 'metadata_9'}}
23 jQuery.getJSON('presentation/lookAndFeel/knowledgeTree/documentmanagement/getHtmlFields.php?fDocumentTypeID=' + docId + '&type=generic', 23 jQuery.getJSON('presentation/lookAndFeel/knowledgeTree/documentmanagement/getHtmlFields.php?fDocumentTypeID=' + docId + '&type=generic',
24 function(json){ 24 function(json){
25 - jQuery.each(json.htmlId, function(id) { 25 + jQuery.each(json.genericId, function(id) {
26 //Building a list of generic fields 26 //Building a list of generic fields
27 genericFields += id + ','; 27 genericFields += id + ',';
28 }); 28 });
29 29
  30 + alert(genericFields);
  31 +
30 var elems = jQuery(document).find(".kt_date_field"); 32 var elems = jQuery(document).find(".kt_date_field");
31 for (i = 0; i < elems.length; i++) { 33 for (i = 0; i < elems.length; i++) {
32 var fieldName = elems[i].id; 34 var fieldName = elems[i].id;
33 //alert(fieldName); 35 //alert(fieldName);
34 - isGeneric = true;  
35 - 36 + isGeneric = false;
36 if (genericFields.indexOf(fieldName.match('metadata_[0-9]+')) >= 0){ 37 if (genericFields.indexOf(fieldName.match('metadata_[0-9]+')) >= 0){
37 - isGeneric = false; 38 + isGeneric = true;
38 } 39 }
39 40
40 if (!isGeneric){ 41 if (!isGeneric){