ドキュメントのリストでフォルダを条件に指定すると検索結果がゼロ件になる問題を修正 (#1088)

Co-authored-by: Jun Matsuda <{ID}+{username}@users.noreply.github.com>
thinkingreed-inc · Sep 4, 2024 · e2bea43 · e2bea43
1 parent cc9d0e0
commit e2bea43
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/include/QueryGenerator/EnhancedQueryGenerator.php b/include/QueryGenerator/EnhancedQueryGenerator.php
@@ -674,7 +674,11 @@ public function getWhereClause() {
 						$columnSql = getSqlForNameInDisplayFormat(array('last_name'=>$columnSqlTable.'.last_name',
 																		'first_name'=>$columnSqlTable.'.first_name'),'Users');
 					} else if(in_array('DocumentFolders', $moduleList)) {
-						$columnSql = "vtiger_attachmentsfolder".$fieldName.".foldername";
+						if($conditionInfo['operator'] == 'e' || $conditionInfo['operator'] == 'n') {
+							$columnSql = "vtiger_attachmentsfolder".$fieldName.".folderid";
+						} else {
+							$columnSql = "vtiger_attachmentsfolder".$fieldName.".foldername";
+						}
 					} else if(in_array('Currency', $moduleList)) {
 						$columnSql = "vtiger_currency_info$parentReferenceField$fieldName.currency_name";
 						if($fieldName == 'currency_id' && is_numeric($conditionInfo['value'])){

diff --git a/layouts/v7/modules/Vtiger/resources/Field.js b/layouts/v7/modules/Vtiger/resources/Field.js
@@ -308,6 +308,12 @@ Vtiger_Field_Js('Vtiger_Documentsfolder_Field_Js',{},{
 	 * @return - select element and chosen element
 	 */
 	getUi : function() {
+		// リストの条件によって表示を変える
+		if(this.get('comparatorElementVal') != 'e' && this.get('comparatorElementVal') != 'n') {
+			var html = '<input class="inputElement" type="text" name="'+ this.getName() +'" value="'+ this.getValue() + '" />';
+			return jQuery(html);
+		}
+
 		//added class inlinewidth
 		var html = '<select class="select2 inputElement inlinewidth" name="'+ this.getName() +'" id="field_'+this.getModuleName()+'_'+this.getName()+'">';
 		var pickListValues = this.getPickListValues();