diff options
| author | Julien Mougenot <jum@odoo.com> | 2020-04-09 07:42:20 +0000 |
|---|---|---|
| committer | Julien Mougenot <jum@odoo.com> | 2020-06-12 13:34:04 +0000 |
| commit | f5f0ca843d98bcbaf0fd8ad63a31a3cacf390168 (patch) | |
| tree | 32f44cf674e904c957559583cd9dbf69e5f971d7 /addons/web/static/src | |
| parent | 84cc6fab9e9c31adc826846f405449a060800b8b (diff) | |
[IMP] *: enable_counters with false as default
In the search panel, the attribute disable_counters with default False
has been changed to enable_counters with default False.
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/views/search_panel.js | 12 | ||||
| -rw-r--r-- | addons/web/static/src/xml/kanban.xml | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/addons/web/static/src/js/views/search_panel.js b/addons/web/static/src/js/views/search_panel.js index 38019fc01cd..5d45150266a 100644 --- a/addons/web/static/src/js/views/search_panel.js +++ b/addons/web/static/src/js/views/search_panel.js @@ -44,7 +44,7 @@ function _processSearchPanelNode(node, fields) { const section = { color: childNode.attrs.color, description: childNode.attrs.string || fields[fieldName].string, - disableCounters: !!pyUtils.py_eval(childNode.attrs.disable_counters || '0'), + enableCounters: !!pyUtils.py_eval(childNode.attrs.enable_counters || '0'), fieldName: fieldName, icon: childNode.attrs.icon, id: sectionId, @@ -390,14 +390,14 @@ const SearchPanel = Widget.extend({ const proms = []; for (const category of Object.values(this.categories)) { const field = this.fields[category.fieldName]; - if (force || !category.disableCounters) { + if (force || category.enableCounters) { const prom = this._rpc({ method: 'search_panel_select_range', model: this.model, args: [category.fieldName], kwargs: { category_domain: this._getCategoryDomain(category.id), - disable_counters: category.disableCounters, + enable_counters: category.enableCounters, search_domain: this.searchDomain, }, }).then(({ parent_field, values }) => { @@ -433,7 +433,7 @@ const SearchPanel = Widget.extend({ kwargs: { category_domain: categoryDomain, comodel_domain: Domain.prototype.stringToArray(filter.domain, evalContext), - disable_counters: filter.disableCounters, + enable_counters: filter.enableCounters, filter_domain: this._getFilterDomain(filter.id), group_by: filter.groupBy || false, group_domain: this._getGroupDomain(filter), @@ -535,10 +535,10 @@ const SearchPanel = Widget.extend({ * @returns {(Array{}|Array[]|undefined)} */ _getGroupDomain(filter) { - const { fieldName, groups, disableCounters } = filter; + const { fieldName, groups, enableCounters } = filter; const { type: fieldType } = this.fields[fieldName]; - if (disableCounters || !groups) { + if (!enableCounters || !groups) { switch (fieldType) { case 'many2one': return []; case 'many2many': return {}; diff --git a/addons/web/static/src/xml/kanban.xml b/addons/web/static/src/xml/kanban.xml index 374ddf73353..f8e6781f6c3 100644 --- a/addons/web/static/src/xml/kanban.xml +++ b/addons/web/static/src/xml/kanban.xml @@ -246,13 +246,13 @@ <t t-set="value" t-value="category.values[valueId]"/> <li class="o_search_panel_category_value border-0 list-group-item" t-att-data-id="value.id" t-att-data-category-id="category.id"> <header t-att-class="'list-group-item-action' + (value.id === category.activeValueId ? ' active' : '')"> - <label t-attf-class="o_search_panel_label mb0{{ category.disableCounters ? '' : ' o_with_counters' }}"> + <label t-attf-class="o_search_panel_label mb0{{ category.enableCounters ? ' o_with_counters' : '' }}"> <div class="o_toggle_fold"> <i t-if="value.childrenIds.length" t-attf-class="fa fa-caret-{{ value.folded ? 'right' : 'down' }}"/> </div> <span class="o_search_panel_label_title"><t t-esc="value.display_name"/></span> </label> - <span t-if="!category.disableCounters and value.__count > 0" + <span t-if="category.enableCounters and value.__count > 0" class="text-muted ml-2 small" t-esc="value.__count" /> @@ -293,7 +293,7 @@ <header class="o_search_panel_group_header"> <div class="custom-control custom-checkbox"> <input type="checkbox" t-att-id="inputId" t-att-checked="group.state === 'checked' ? 'checked' : undefined" class="custom-control-input"/> - <label t-att-for="inputId" t-attf-class="o_search_panel_label custom-control-label{{ group.disableCounters ? '' : ' o_with_counters' }}" t-att-title="group.tooltip"> + <label t-att-for="inputId" t-attf-class="o_search_panel_label custom-control-label{{ group.enableCounters ? ' o_with_counters' : '' }}" t-att-title="group.tooltip"> <span class="o_search_panel_label_title"> <span t-if="group.hex_color" t-attf-style="color: {{ group.hex_color }};">●</span> <t t-esc="group.name"/> @@ -326,7 +326,7 @@ <input type="checkbox" t-att-id="inputId" t-att-checked="value.checked ? 'checked' : undefined" class="custom-control-input"/> <label t-att-for="inputId" class="o_search_panel_label custom-control-label" t-att-title="group && group.tooltip"> <span class="o_search_panel_label_title" t-esc="value.display_name"/> - <span t-if="!filter.disableCounters and value.__count > 0" + <span t-if="filter.enableCounters and value.__count > 0" class="text-muted ml-2 small" t-esc="value.__count" /> |
