devops_admin
/
odex25_standard
mirror of https://github.com/hydracp9/odex25_standard
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4467 from expsa/revert-4466-eltayar 

Revert "Enhanced search functionality to work in both standalone and embedded…"
This commit is contained in:
Mohamed Eltayar 2025-08-31 16:32:53 +03:00 committed by GitHub
parent 8df9afca5e 24f105d8ec
commit 3e28bcf127
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 20 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

151
odex25_base/fims_general_search_tree_view/static/src/js/list_search.js
View File

@ -20,9 +20,7 @@ odoo.define('fims_general_search_tree_view.list_search', function (require) {
originalDomain: null,
searchInProgress: false,
lastSearchPromise: null,
lastSearchValue: '',
isEmbedded: false,
originalData: null
lastSearchValue: ''
};
this._searchMutex = new concurrency.Mutex();
},
@ -73,21 +71,14 @@ odoo.define('fims_general_search_tree_view.list_search', function (require) {
return self._clearCustomSearch();
}
// تحديد نوع الليست (embedded أو standalone)
var state = self.model.get(self.handle);
if (state && state.parentID) {
self._customSearchState.isEmbedded = true;
return self._applyEmbeddedSearch(value);
} else {
self._customSearchState.isEmbedded = false;
if (!self._customSearchState.originalDomain && !self._customSearchState.isFiltered) {
var currentState = self.model.get(self.handle);
if (currentState && currentState.domain) {
self._customSearchState.originalDomain = JSON.parse(JSON.stringify(currentState.domain));
}
if (!self._customSearchState.originalDomain && !self._customSearchState.isFiltered) {
var currentState = self.model.get(self.handle);
if (currentState && currentState.domain) {
self._customSearchState.originalDomain = JSON.parse(JSON.stringify(currentState.domain));
}
return self._applyCustomSearch(value);
}
return self._applyCustomSearch(value);
}).finally(function() {
self._customSearchState.searchInProgress = false;
self._customSearchState.lastSearchPromise = null;
@ -143,103 +134,6 @@ odoo.define('fims_general_search_tree_view.list_search', function (require) {
});
},
// دالة جديدة للبحث في embedded lists
_applyEmbeddedSearch: function(value) {
var self = this;
if (self.renderer) {
self.renderer.$('.oe_search_loading').show();
self.renderer.$('.oe_search_count').hide();
}
// حفظ البيانات الأصلية إذا لم تكن محفوظة
if (!self._customSearchState.originalData) {
self._customSearchState.originalData = self._getEmbeddedData();
}
var searchFields = this._getCustomSearchableFields();
var filteredData = [];
var allData = self._customSearchState.originalData;
// البحث في البيانات محلياً
allData.forEach(function(record) {
var matchFound = false;
searchFields.forEach(function(field) {
if (matchFound) return;
var fieldValue = record[field.name];
if (fieldValue !== null && fieldValue !== undefined) {
var valueStr = '';
// معالجة أنواع الحقول المختلفة
if (field.type === 'many2one' && Array.isArray(fieldValue)) {
valueStr = fieldValue[1] || '';
} else if (field.type === 'selection') {
valueStr = fieldValue || '';
} else {
valueStr = String(fieldValue);
}
var normalizedValue = self._normalizeText(valueStr.toLowerCase());
var normalizedSearch = self._normalizeText(value.toLowerCase());
if (normalizedValue.indexOf(normalizedSearch) !== -1 ||
valueStr.toLowerCase().indexOf(value.toLowerCase()) !== -1) {
matchFound = true;
}
}
});
if (matchFound) {
filteredData.push(record);
}
});
// تحديث العرض
self._updateEmbeddedView(filteredData);
self._updateCustomSearchUI(filteredData.length);
self._customSearchState.isFiltered = true;
self._customSearchState.value = value;
self._customSearchState.filteredCount = filteredData.length;
if (self.renderer) {
self.renderer.$('.oe_search_loading').hide();
}
return Promise.resolve();
},
// دالة للحصول على بيانات embedded list
_getEmbeddedData: function() {
var state = this.model.get(this.handle);
if (state && state.data) {
return JSON.parse(JSON.stringify(state.data)); // deep copy
}
return [];
},
// دالة لتحديث العرض مع البيانات المفلترة
_updateEmbeddedView: function(filteredData) {
if (!this.renderer || !this.renderer.$) return;
var $rows = this.renderer.$el.find('tbody tr.o_data_row');
$rows.each(function(index, row) {
var $row = $(row);
var recordId = $row.data('id');
var shouldShow = filteredData.some(function(record) {
return record.id === recordId;
});
if (shouldShow) {
$row.show();
} else {
$row.hide();
}
});
},
_clearCustomSearch: function() {
var self = this;
@ -255,21 +149,6 @@ odoo.define('fims_general_search_tree_view.list_search', function (require) {
this._customSearchState.filteredCount = 0;
this._customSearchState.lastSearchValue = '';
// للـ embedded lists
if (this._customSearchState.isEmbedded) {
if (this.renderer && this.renderer.$) {
this.renderer.$el.find('tbody tr.o_data_row').show();
}
this._customSearchState.originalData = null;
if (this.renderer) {
this.renderer.$('.oe_search_loading').hide();
}
return Promise.resolve();
}
// للـ standalone lists
var originalDomain = this._customSearchState.originalDomain || [];
this._customSearchState.originalDomain = null;
@ -520,9 +399,19 @@ odoo.define('fims_general_search_tree_view.list_search', function (require) {
return false;
}
// **الحل الجديد: نسمح بالبحث في كل الـ list views**
// سواء كانت standalone أو embedded
return true;
// الحل الدقيق الوحيد المؤكد:
// فحص الـ model state للـ ListRenderer
var controller = this.getParent();
if (controller && controller.model && controller.handle) {
var state = controller.model.get(controller.handle);
// إذا كان parentID موجود، فهذا يعني أن الـ list embedded داخل relational field
if (state && state.parentID) {
return false; // لا نظهر البحث للـ embedded lists
}
}
return true; // نظهر البحث للـ standalone lists فقط
},
_addCustomSearchBox: function() {