Skip to content

Commit d2a1984

Browse files
robinlejFrancoisGe
robinlej
authored and
FrancoisGe
committed
fix websiteConfig checkVars
1 parent 9b1e093 commit d2a1984

File tree

3 files changed

+56
-50
lines changed

3 files changed

+56
-50
lines changed

‎addons/html_builder/static/src/plugins/header_navbar_option.xml

Lines changed: 29 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<templates xml:space="preserve">
3-
3+
44
<t t-name="html_builder.HeaderNavbarOption">
55
<BuilderRow label.translate="Mobile Alignment">
66
<BuilderSelect action="'websiteConfig'" id="'header_mobile_alignment_opt'">
7-
<BuilderSelectItem
7+
<BuilderSelectItem
88
label.translate="Left"
99
actionParam="{
1010
views: [],
1111
vars: {'hamburger-position-mobile': 'left'}
1212
}"
1313
>Left</BuilderSelectItem>
14-
<BuilderSelectItem
14+
<BuilderSelectItem
1515
label.translate="Center"
1616
actionParam="{
1717
views: ['website.template_header_mobile_align_center', 'website.template_header_hamburger_mobile_align_center'],
1818
vars: {'hamburger-position-mobile': 'center'}
1919
}"
2020
>Center</BuilderSelectItem>
21-
<BuilderSelectItem
21+
<BuilderSelectItem
2222
label.translate="Right"
2323
actionParam="{
2424
views: ['website.template_header_mobile_align_right', 'website.template_header_hamburger_mobile_align_right'],
@@ -35,29 +35,29 @@
3535
<BuilderNumberInput action="'customizeWebsiteVariable'" actionParam="'header-font-size'" unit="'px'" saveUnit="'rem'"/>
3636
<BuilderColorPicker action="'customizeWebsiteVariable'" actionParam="'header-text-color'"/>
3737
<BuilderSelect applyTo="'#top_menu'" action="'websiteConfig'" id="'header_alignment_opt'">
38-
<BuilderSelectItem
39-
actionParam="{
40-
views: [],
41-
vars: {'hamburger-position': 'left'}
38+
<BuilderSelectItem
39+
actionParam="{
40+
views: [],
41+
vars: {'hamburger-position': 'left'}
4242
}"
4343
className="'o_we_icon_select'"
4444
>
4545
<i class="fa fa-align-left fa-fw"></i>
4646
</BuilderSelectItem>
47-
<BuilderSelectItem
47+
<BuilderSelectItem
4848
t-if="!hasSomeViews(['website.template_header_hamburger'])"
49-
actionParam="{
50-
views: ['website.template_header_default_align_center', 'website.template_header_boxed_align_center', 'website.template_header_stretch_align_center', 'website.template_header_search_align_center', 'website.template_header_sales_one_align_center', 'website.template_header_sales_two_align_center', 'website.template_header_sales_four_align_center', 'website.template_header_sidebar_align_center'],
51-
vars: {'hamburger-position': 'center'}
49+
actionParam="{
50+
views: ['website.template_header_default_align_center', 'website.template_header_boxed_align_center', 'website.template_header_stretch_align_center', 'website.template_header_search_align_center', 'website.template_header_sales_one_align_center', 'website.template_header_sales_two_align_center', 'website.template_header_sales_four_align_center', 'website.template_header_sidebar_align_center'],
51+
vars: {'hamburger-position': 'center'}
5252
}"
5353
className="'o_we_icon_select'"
5454
>
5555
<i class="fa fa-align-center fa-fw"></i>
5656
</BuilderSelectItem>
57-
<BuilderSelectItem
58-
actionParam="{
59-
views: ['website.template_header_default_align_right', 'website.template_header_hamburger_align_right', 'website.template_header_boxed_align_right', 'website.template_header_stretch_align_right', 'website.template_header_search_align_right', 'website.template_header_sales_one_align_right', 'website.template_header_sales_two_align_right', 'website.template_header_sales_four_align_right', 'website.template_header_sidebar_align_right'],
60-
vars: {'hamburger-position': 'right'}
57+
<BuilderSelectItem
58+
actionParam="{
59+
views: ['website.template_header_default_align_right', 'website.template_header_hamburger_align_right', 'website.template_header_boxed_align_right', 'website.template_header_stretch_align_right', 'website.template_header_search_align_right', 'website.template_header_sales_one_align_right', 'website.template_header_sales_two_align_right', 'website.template_header_sales_four_align_right', 'website.template_header_sidebar_align_right'],
60+
vars: {'hamburger-position': 'right'}
6161
}"
6262
className="'o_we_icon_select'"
6363
>
@@ -68,94 +68,88 @@
6868
</BuilderRow>
6969
<BuilderRow label.translate="Link Style" t-if="hasSomeViews(['website.template_header_default', 'website.template_header_boxed', 'website.template_header_vertical', 'website.template_header_search', 'website.template_header_sales_one', 'website.template_header_sales_two', 'website.template_header_sales_three', 'website.template_header_sales_four'])">
7070
<BuilderSelect action="'websiteConfig'">
71-
<BuilderSelectItem
71+
<BuilderSelectItem
7272
id="'option_header_navbar_links_default'"
7373
label.translate="Default"
7474
actionParam="{
7575
views: [],
7676
vars: {'header-links-style': 'default'},
77-
checkVars: true,
7877
}"
7978
>Default</BuilderSelectItem>
80-
<BuilderSelectItem
79+
<BuilderSelectItem
8180
id="'option_header_navbar_links_fill'"
8281
label.translate="Fill"
8382
actionParam="{
8483
views: ['website.header_navbar_pills_style'],
8584
vars: {'header-links-style': 'fill'},
86-
checkVars: true,
8785
}"
8886
>Fill</BuilderSelectItem>
89-
<BuilderSelectItem
87+
<BuilderSelectItem
9088
id="'option_header_navbar_links_outline'"
9189
label.translate="Outline"
9290
actionParam="{
9391
views: [],
9492
vars: {'header-links-style': 'outline'},
95-
checkVars: true,
9693
}"
9794
>Outline</BuilderSelectItem>
98-
<BuilderSelectItem
95+
<BuilderSelectItem
9996
id="'option_header_navbar_links_pills'"
10097
label.translate="Pill"
10198
actionParam="{
10299
views: ['website.header_navbar_pills_style'],
103100
vars: {'header-links-style': 'pills'},
104-
checkVars: true,
105101
}"
106102
>Pill</BuilderSelectItem>
107-
<BuilderSelectItem
103+
<BuilderSelectItem
108104
id="'option_header_navbar_block'"
109105
label.translate="Block"
110106
actionParam="{
111107
views: ['website.header_navbar_pills_style'],
112108
vars: {'header-links-style': 'block'},
113-
checkVars: true,
114109
}"
115110
>Block</BuilderSelectItem>
116-
<BuilderSelectItem
111+
<BuilderSelectItem
117112
id="'option_header_navbar_border_bottom'"
118113
label.translate="Border Bottom"
119114
actionParam="{
120115
views: [],
121116
vars: {'header-links-style': 'border-bottom'},
122-
checkVars: true,
123117
}"
124118
>Border Bottom</BuilderSelectItem>
125119
</BuilderSelect>
126120
</BuilderRow>
127121
<BuilderRow label.translate="Additional color">
128122
<BuilderSelect action="'websiteConfig'">
129-
<BuilderSelectItem
123+
<BuilderSelectItem
130124
label.translate="Default"
131125
actionParam="{views: []}"
132126
>Default</BuilderSelectItem>
133-
<BuilderSelectItem
127+
<BuilderSelectItem
134128
label.translate="Primary"
135129
actionParam="{views: ['website.template_header_additional_color_primary']}"
136130
>Primary</BuilderSelectItem>
137-
<BuilderSelectItem
131+
<BuilderSelectItem
138132
label.translate="Secondary"
139133
actionParam="{views: ['website.template_header_additional_color_secondary']}"
140134
>Secondary</BuilderSelectItem>
141135
</BuilderSelect>
142136
</BuilderRow>
143137
<BuilderRow label.translate="Sub Menus">
144138
<BuilderSelect action="'websiteConfig'">
145-
<BuilderSelectItem
139+
<BuilderSelectItem
146140
id="header_dropdown_on_click_opt"
147141
label.translate="On Click"
148142
actionParam="{views: []}"
149143
className=""
150144
>On Click</BuilderSelectItem>
151-
<BuilderSelectItem
145+
<BuilderSelectItem
152146
label.translate="On Hover"
153147
actionParam="{views: ['website.header_hoverable_dropdown']}"
154148
className="'o_hoverable_dropdown'"
155149
>On Hover</BuilderSelectItem>
156150
</BuilderSelect>
157151
</BuilderRow>
158-
152+
159153
</t>
160-
154+
161155
</templates>

‎addons/html_builder/static/src/website_builder/plugins/customize_website_plugin.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -285,16 +285,17 @@ export class CustomizeWebsitePlugin extends Plugin {
285285
},
286286
isApplied: ({ params }) => {
287287
const records = [...(params.views || []), ...(params.assets || [])];
288-
const configKeysIsApplied = records.every((v) => this.getConfigKey(v))
289-
if (params.checkVars && params.checkVars !== undefined) {
288+
const configKeysIsApplied = records.every((v) => this.getConfigKey(v));
289+
if (params.checkVars || params.checkVars === undefined) {
290290
return (
291291
configKeysIsApplied &&
292292
Object.entries(params.vars || {}).every(
293-
([variable, value]) => value === this.getWebsiteVariableValue(variable)
293+
([variable, value]) =>
294+
value === this.getWebsiteVariableValue(variable)
294295
)
295296
);
296297
}
297-
return configKeysIsApplied
298+
return configKeysIsApplied;
298299
},
299300
apply: async (action) => this.toggleConfig(action, true),
300301
clean: (action) => this.toggleConfig(action, false),

‎addons/html_builder/static/src/website_builder/plugins/options/header_option.xml

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
action: 'websiteConfig',
1313
actionParam: {
1414
views: ['website.template_header_default'],
15-
vars: {'header-links-style': 'default', 'header-template': 'default'}
15+
vars: {'header-links-style': 'default', 'header-template': 'default'},
16+
checkVars: false,
1617
}
1718
}
1819
]"
@@ -26,7 +27,8 @@
2627
action: 'websiteConfig',
2728
actionParam: {
2829
views: ['website.template_header_hamburger', 'website.no_autohide_menu'],
29-
vars: {'header-links-style': 'default', 'header-template': 'hamburger'}
30+
vars: {'header-links-style': 'default', 'header-template': 'hamburger'},
31+
checkVars: false,
3032
}
3133
}
3234
]"
@@ -40,7 +42,8 @@
4042
action: 'websiteConfig',
4143
actionParam: {
4244
views: ['website.header_navbar_pills_style','website.template_header_boxed'],
43-
vars: {'header-links-style': 'pills', 'header-template': 'boxed'}
45+
vars: {'header-links-style': 'pills', 'header-template': 'boxed'},
46+
checkVars: false,
4447
}
4548
}
4649
]"
@@ -54,7 +57,8 @@
5457
action: 'websiteConfig',
5558
actionParam: {
5659
views: ['website.template_header_stretch'],
57-
vars: {'header-links-style': 'default', 'header-template': 'stretch'}
60+
vars: {'header-links-style': 'default', 'header-template': 'stretch'},
61+
checkVars: false,
5862
}
5963
}
6064
]"
@@ -68,7 +72,8 @@
6872
action: 'websiteConfig',
6973
actionParam: {
7074
views: ['website.template_header_vertical'],
71-
vars: {'header-links-style': 'default', 'header-template': 'vertical'}
75+
vars: {'header-links-style': 'default', 'header-template': 'vertical'},
76+
checkVars: false,
7277
}
7378
}
7479
]"
@@ -82,7 +87,8 @@
8287
action: 'websiteConfig',
8388
actionParam: {
8489
views: ['website.template_header_search'],
85-
vars: {'header-links-style': 'default', 'header-template': 'search'}
90+
vars: {'header-links-style': 'default', 'header-template': 'search'},
91+
checkVars: false,
8692
}
8793
}
8894
]"
@@ -96,7 +102,8 @@
96102
action: 'websiteConfig',
97103
actionParam: {
98104
views: ['website.template_header_sales_one'],
99-
vars: {'header-links-style': 'default', 'header-template': 'sales_one'}
105+
vars: {'header-links-style': 'default', 'header-template': 'sales_one'},
106+
checkVars: false,
100107
}
101108
}
102109
]"
@@ -110,7 +117,8 @@
110117
action: 'websiteConfig',
111118
actionParam: {
112119
views: ['website.template_header_sales_two'],
113-
vars: {'header-links-style': 'default', 'header-template': 'sales_two'}
120+
vars: {'header-links-style': 'default', 'header-template': 'sales_two'},
121+
checkVars: false,
114122
}
115123
}
116124
]"
@@ -124,7 +132,8 @@
124132
action: 'websiteConfig',
125133
actionParam: {
126134
views: ['website.template_header_sales_three'],
127-
vars: {'header-links-style': 'default', 'header-template': 'sales_three'}
135+
vars: {'header-links-style': 'default', 'header-template': 'sales_three'},
136+
checkVars: false,
128137
}
129138
}
130139
]"
@@ -138,7 +147,8 @@
138147
action: 'websiteConfig',
139148
actionParam: {
140149
views: ['website.template_header_sales_four'],
141-
vars: {'header-links-style': 'default', 'header-template': 'sales_four'}
150+
vars: {'header-links-style': 'default', 'header-template': 'sales_four'},
151+
checkVars: false,
142152
}
143153
}
144154
]"
@@ -153,7 +163,8 @@
153163
action: 'websiteConfig',
154164
actionParam: {
155165
views: ['website.template_header_sidebar', 'website.no_autohide_menu'],
156-
vars: {'header-links-style': 'default', 'header-template': 'sidebar'}
166+
vars: {'header-links-style': 'default', 'header-template': 'sidebar'},
167+
checkVars: false,
157168
}
158169
}
159170
]"

0 commit comments

Comments
 (0)