[FIX] spreadsheet: rename conflicting getter
closes odoo/odoo#102706 Signed-off-by: Lucas Lefèvre (lul) <lul@odoo.com>
This commit is contained in:
committed by
Lucas Lefèvre
parent
c9022c7494
commit
590957106b
+1
-1
@@ -41,7 +41,7 @@
|
||||
</t>
|
||||
</select>
|
||||
</div>
|
||||
<i t-if="getters.isFilterActive(filter.id)"
|
||||
<i t-if="getters.isGlobalFilterActive(filter.id)"
|
||||
class="fa fa-times btn btn-link text-muted o_side_panel_filter_icon ms-1"
|
||||
title="Clear"
|
||||
t-on-click="() => this.onClear(filter.id)"/>
|
||||
|
||||
@@ -169,7 +169,7 @@ export default class GlobalFiltersUIPlugin extends spreadsheet.UIPlugin {
|
||||
*
|
||||
* @returns { boolean } true if the given filter is active
|
||||
*/
|
||||
isFilterActive(id) {
|
||||
isGlobalFilterActive(id) {
|
||||
const { type } = this.getters.getGlobalFilter(id);
|
||||
const value = this.getGlobalFilterValue(id);
|
||||
switch (type) {
|
||||
@@ -191,8 +191,9 @@ export default class GlobalFiltersUIPlugin extends spreadsheet.UIPlugin {
|
||||
* @returns {number}
|
||||
*/
|
||||
getActiveFilterCount() {
|
||||
return this.getters.getGlobalFilters().filter((filter) => this.isFilterActive(filter.id))
|
||||
.length;
|
||||
return this.getters
|
||||
.getGlobalFilters()
|
||||
.filter((filter) => this.isGlobalFilterActive(filter.id)).length;
|
||||
}
|
||||
|
||||
getFilterDisplayValue(filterName) {
|
||||
@@ -322,7 +323,7 @@ export default class GlobalFiltersUIPlugin extends spreadsheet.UIPlugin {
|
||||
* @returns {Domain|undefined}
|
||||
*/
|
||||
_getDateDomain(filter, fieldMatching) {
|
||||
if (!this.isFilterActive(filter.id)) {
|
||||
if (!this.isGlobalFilterActive(filter.id)) {
|
||||
return undefined;
|
||||
}
|
||||
let granularity;
|
||||
@@ -454,5 +455,5 @@ GlobalFiltersUIPlugin.getters = [
|
||||
"getGlobalFilterDomain",
|
||||
"getGlobalFilterValue",
|
||||
"getActiveFilterCount",
|
||||
"isFilterActive",
|
||||
"isGlobalFilterActive",
|
||||
];
|
||||
|
||||
Reference in New Issue
Block a user