pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] Web: Cannot collapse calendar sidebar

Browse Source 
A calendar filter's id is the concatenation of "o_cw_filter_collapse_" and the title of the filter.
When title has space (like "Time Off Type"), the id become "o_cw_filter_collapse_Time Off Type", which is invalid.
So, we can't collapse the filter.
With this fix, it replace space by nothing so if there is space in title (like "Time Off Type"), the id is "o_cw_filter_collapse_TimeOffType".

Task id: 2318645
This commit is contained in:
Giacomello Nathan
2020-12-09 15:53:09 +01:00
committed by Yannick Tivisse
parent 2af0a86db8
commit 6cfec48ba4
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/static/src/xml/web_calendar.xml
+3 -2
View File
@@ -52,14 +52,15 @@
<t t-name="CalendarView.sidebar.filter">
<t t-set="needCollapse" t-value="widget.filters.length > 2 and widget.title"></t>
<t t-set="titleWithoutSpace" t-value="widget.title.split(' ').join('')"></t>
<div class="o_calendar_filter">
<h5 t-if="needCollapse" type="button" data-toggle="collapse" t-attf-data-target="#o_cw_filter_collapse_#{widget.title}" class="d-flex justify-content-between align-items-center">
<h5 t-if="needCollapse" type="button" data-toggle="collapse" t-attf-data-target="#o_cw_filter_collapse_#{titleWithoutSpace}" class="d-flex justify-content-between align-items-center">
<t t-esc="widget.title"/><i class="o_cw_filter_collapse_icon fa fa-chevron-down"/>
</h5>
<h5 t-elif="widget.title" t-esc="widget.title"/>
<div t-attf-class="o_calendar_filter_items #{needCollapse ? 'collapse show' : 0}" aria-expanded="true" t-attf-id="o_cw_filter_collapse_#{widget.title}">
<div t-attf-class="o_calendar_filter_items #{needCollapse ? 'collapse show' : 0}" aria-expanded="true" t-attf-id="o_cw_filter_collapse_#{titleWithoutSpace}">
<t t-foreach="widget.filters" t-as="filter" t-if="filter.display == null || filter.display">
<t t-set="idForLabel" t-value="_.uniqueId('o_calendar_filter_item_')"/>
<t t-set="color" t-value="widget.getColor(filter.color_index)"/>
addons/web/static/tests/views/calendar_tests.js
+4 -3
View File
@@ -57,7 +57,7 @@ QUnit.module('Views', {
allday: {string: "allday", type: "boolean"},
partner_ids: {string: "attendees", type: "one2many", relation: 'partner', default: [[6, 0, [1]]]},
type: {string: "type", type: "integer"},
event_type_id: {string: "Event_Type", type: "many2one", relation: 'event_type'},
event_type_id: {string: "Event Type", type: "many2one", relation: 'event_type'},
color: {string: "Color", type: "integer", related: 'event_type_id.color'},
is_hatched: {string: "Hatched", type: "boolean"}
},
@@ -2190,7 +2190,7 @@ QUnit.module('Views', {
});
QUnit.test('Add filters and specific color', async function (assert) {
assert.expect(5);
assert.expect(6);
this.data.event.records.push(
{id: 8, user_id: 4, partner_id: 1, name: "event 8", start: "2016-12-11 09:00:00", stop: "2016-12-11 10:00:00", allday: false, partner_ids: [1,2,3], event_type_id: 3, color: 4},
@@ -2219,8 +2219,9 @@ QUnit.module('Views', {
assert.containsN(calendar, '.o_calendar_filter', 2, "should display 2 filters");
var $typeFilter = calendar.$('.o_calendar_filter:has(h5:contains(Event_Type))');
var $typeFilter = calendar.$('.o_calendar_filter:has(h5:contains(Event Type))');
assert.ok($typeFilter.length, "should display 'Event Type' filter");
assert.containsOnce($typeFilter, '#o_cw_filter_collapse_EventType', "Id should be equals to o_cw_filter_collapse_EventType for 'Event Type'");
assert.containsN($typeFilter, '.o_calendar_filter_item', 3, "should display 3 filter items for 'Event Type'");
assert.containsOnce($typeFilter, '.o_calendar_filter_item[data-value=3].o_cw_filter_color_4', "Filter for event type 3 must have the color 4");