audrius/web
1
0
Fork 1
mirror of https://github.com/OCA/web.git synced 2025-02-22 13:21:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #763 from Tecnativa/10.0-web_widget_domain_v11-fix_operator_selector

Browse Source 
[FIX] web_widget_domain_v11: Allow to change operator
This commit is contained in:
Pedro M. Baeza
2017-10-19 18:10:28 +02:00
committed by GitHub
parent b1f0cf0df2 05381660f7
commit 3bdd1baccf
3 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web_widget_domain_v11/static/src/copied-css/domain_selector.less
View File

@@ -9,10 +9,6 @@
}
&.o_domain_tree {
.o_domain_tree_operator_caret::after {
.o-caret-down();
}
> .o_domain_node_children_container {
padding-left: @o-domain-selector-indent;

4
web_widget_domain_v11/static/src/copied-js/domain_selector.js
View File

@@ -84,10 +84,10 @@ var DomainNode = Widget.extend({
var DomainTree = DomainNode.extend({
template: "DomainTree",
events: _.extend({}, DomainNode.prototype.events, {
"click .o_domain_tree_operator_selector > ul > li > a": function (e) {
"change .o_domain_tree_operator_selector": function (e) {
e.preventDefault();
e.stopPropagation();
this.changeOperator($(e.target).data("operator"));
this.changeOperator($(e.target).val());
},
}),
custom_events: {

15
web_widget_domain_v11/static/src/copied-xml/templates.xml
View File

@@ -26,16 +26,11 @@
</div>
</t>
<t t-name="DomainTree.OperatorSelector">
<div t-if="!widget.readonly" class="btn-group o_domain_tree_operator_selector">
<button class="btn btn-xs btn-primary o_domain_tree_operator_caret" data-toggle="dropdown">
<t t-if="widget.operator === '&amp;'">All</t>
<t t-if="widget.operator === '|'">Any</t>
<t t-if="widget.operator === '!'">None</t>
</button>
<ul class="dropdown-menu">
<li><a href="#" data-operator="&amp;">All</a></li>
<li><a href="#" data-operator="|">Any</a></li>
</ul>
<div t-if="!widget.readonly" class="btn-group">
<select class="o_domain_tree_operator_selector">
<option value="&amp;" t-att-selected="widget.operator === '&amp;' ? 'selected' : null">All</option>
<option value="|" t-att-selected="widget.operator === '|' ? 'selected' : null">Any</option>
</select>
</div>
<strong t-else="">
<t t-if="widget.operator === '&amp;'">ALL</t>