diff --git a/plugins/multiselect/BulkImport.php b/plugins/multiselect/BulkImport.php old mode 100644 new mode 100755 index 7aa40bd..b42fb88 --- a/plugins/multiselect/BulkImport.php +++ b/plugins/multiselect/BulkImport.php @@ -292,14 +292,17 @@ class InetBulkImportFolderMultiSelectAction extends KTFolderAction { // name='metadata[fieldset][metadata_9]' $aData = $_REQUEST['data']; + $data = $aData; + /* $oForm = $this->getBulkImportForm(); $res = $oForm->validate(); if (!empty($res['errors'])) { return $oForm->handleError(); } $data = $res['results']; - + */ + $doctypeid = $requestDocumentType; $aGenericFieldsetIds = KTFieldset::getGenericFieldsets(array('ids' => false)); $aSpecificFieldsetIds = KTFieldset::getForDocumentType($doctypeid, array('ids' => false)); @@ -312,6 +315,7 @@ class InetBulkImportFolderMultiSelectAction extends KTFolderAction { foreach ($fields as $oField) { $val = KTUtil::arrayGet($values, 'metadata_' . $oField->getId()); + if ($oFieldset->getIsConditional()) { if ($val == _kt('No selection.')) @@ -319,16 +323,16 @@ class InetBulkImportFolderMultiSelectAction extends KTFolderAction { $val = null; } } - + if (!is_null($val)) { $MDPack[] = array( $oField, $val ); } - + } - } + } $aOptions = array( 'documenttype' => $oDocumentType, @@ -340,7 +344,7 @@ class InetBulkImportFolderMultiSelectAction extends KTFolderAction { $po->start(); $oUploadChannel =& KTUploadChannel::getSingleton(); $oUploadChannel->addObserver($po); - + $fs =& new KTFSImportStorage($sPath); $bm =& new KTBulkImportManager($this->oFolder, $fs, $this->oUser, $aOptions); if(KTPluginUtil::pluginIsActive('inet.foldermetadata.plugin')) diff --git a/plugins/multiselect/BulkUpload.php b/plugins/multiselect/BulkUpload.php old mode 100644 new mode 100755 index f2ce9ac..db2aaa6 --- a/plugins/multiselect/BulkUpload.php +++ b/plugins/multiselect/BulkUpload.php @@ -330,7 +330,6 @@ class InetBulkUploadFolderAction extends KTFolderAction { foreach ($fields as $oField) { //var_dump($oField->getId()); $val = KTUtil::arrayGet($values, 'metadata_' . $oField->getId()); - //var_dump($val); if ($oFieldset->getIsConditional()) { if ($val == _kt('No selection.')) diff --git a/resources/js/kt_bulkupload.js b/resources/js/kt_bulkupload.js index 7537881..180c372 100755 --- a/resources/js/kt_bulkupload.js +++ b/resources/js/kt_bulkupload.js @@ -30,7 +30,7 @@ function swapInItem(docId, elementId, req) { var elems = jQuery(document).find(".kt_date_field"); for (i = 0; i < elems.length; i++) { var fieldName = elems[i].id; - //alert(fieldName); + isGeneric = false; if (genericFields.indexOf(fieldName.match('metadata_[0-9]+')) >= 0){ isGeneric = true; @@ -38,7 +38,7 @@ function swapInItem(docId, elementId, req) { if (!isGeneric){ var dp = new Ext.form.DateField({ - name: fieldName, + name: fieldName.replace('div_', ''), allowBlank:false, size:10, format: 'Y-m-d', diff --git a/templates/ktcore/forms/widgets/date.smarty b/templates/ktcore/forms/widgets/date.smarty index d8a8feb..47a7ba4 100755 --- a/templates/ktcore/forms/widgets/date.smarty +++ b/templates/ktcore/forms/widgets/date.smarty @@ -1,7 +1,7 @@ -
+ {literal}