odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[imp] nivified extended search 

bzr revid: nicolas.vanhoren@openerp.com-20120124143318-pw8eka0zvrh7n3mt
This commit is contained in:
niv-openerp 2012-01-24 15:33:18 +01:00
parent 87f8049c56
commit ac845b1bfa
3 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/web/static/src/js/chrome.js
View File

@ -41,7 +41,7 @@ openerp.web.Dialog = openerp.web.Widget.extend(/** @lends openerp.web.Dialog# */
identifier_prefix: 'dialog',
/**
* @constructs openerp.web.Dialog
* @extends openerp.web.OldWidget
* @extends openerp.web.Widget
*
* @param parent
* @param options

13
addons/web/static/src/js/search.js
View File

@ -1038,7 +1038,7 @@ openerp.web.search.ManyToOneField = openerp.web.search.CharField.extend({
}
});
openerp.web.search.ExtendedSearch = openerp.web.OldWidget.extend({
openerp.web.search.ExtendedSearch = openerp.web.search.Widget.extend({
template: 'SearchView.extended_search',
identifier_prefix: 'extended-search',
init: function (parent, model) {
@ -1051,7 +1051,7 @@ openerp.web.search.ExtendedSearch = openerp.web.OldWidget.extend({
this.check_last_element();
},
start: function () {
this.$element = $("#" + this.element_id);
this._super();
this.$element.closest("table.oe-searchview-render-line").css("display", "none");
var self = this;
this.rpc("/web/searchview/fields_get",
@ -1105,7 +1105,7 @@ openerp.web.search.ExtendedSearch = openerp.web.OldWidget.extend({
}
});
openerp.web.search.ExtendedSearchGroup = openerp.web.OldWidget.extend({
openerp.web.search.ExtendedSearchGroup = openerp.web.Widget.extend({
template: 'SearchView.extended_search.group',
identifier_prefix: 'extended-search-group',
init: function (parent, fields) {
@ -1119,7 +1119,6 @@ openerp.web.search.ExtendedSearchGroup = openerp.web.OldWidget.extend({
prop.start();
},
start: function () {
this.$element = $("#" + this.element_id);
var _this = this;
this.add_prop();
this.$element.find('.searchview_extended_add_proposition').click(function () {
@ -1151,12 +1150,12 @@ openerp.web.search.ExtendedSearchGroup = openerp.web.OldWidget.extend({
}
});
openerp.web.search.ExtendedSearchProposition = openerp.web.OldWidget.extend(/** @lends openerp.web.search.ExtendedSearchProposition# */{
openerp.web.search.ExtendedSearchProposition = openerp.web.Widget.extend(/** @lends openerp.web.search.ExtendedSearchProposition# */{
template: 'SearchView.extended_search.proposition',
identifier_prefix: 'extended-search-proposition',
/**
* @constructs openerp.web.search.ExtendedSearchProposition
* @extends openerp.web.OldWidget
* @extends openerp.web.Widget
*
* @param parent
* @param fields
@ -1247,7 +1246,7 @@ openerp.web.search.ExtendedSearchProposition = openerp.web.OldWidget.extend(/**
}
});
openerp.web.search.ExtendedSearchProposition.Field = openerp.web.OldWidget.extend({
openerp.web.search.ExtendedSearchProposition.Field = openerp.web.Widget.extend({
start: function () {
this.$element = $("#" + this.element_id);
}

16
addons/web/static/src/xml/base.xml
View File

@ -1331,7 +1331,7 @@
</t>
</t>
<t t-name="SearchView.extended_search.group">
<div t-att-id="element_id" class="searchview_extended_group">
<div t-att-id="widget.element_id" class="searchview_extended_group">
<select class="searchview_extended_group_choice">
<option value="any">Any of the following conditions must match</option>
<option value="all">All the following conditions must match</option>
@ -1347,11 +1347,11 @@
</div>
</t>
<t t-name="SearchView.extended_search.proposition">
<div t-att-id="element_id">
<div t-att-id="widget.element_id">
<select class="searchview_extended_prop_field">
<t t-foreach="attrs.fields" t-as="field">
<t t-foreach="widget.attrs.fields" t-as="field">
<option t-if="typeof field.store === 'undefined' || field.store || field.fnct_search"
t-att="{'selected': field === attrs.selected ? 'selected' : null}"
t-att="{'selected': field === widget.attrs.selected ? 'selected' : null}"
t-att-value="field.name">
<t t-esc="field.string"/>
</option>
@ -1364,16 +1364,16 @@
</div>
</t>
<t t-name="SearchView.extended_search.proposition.char">
<input t-att-id="element_id" class="field_char"/>
<input t-att-id="widget.element_id" class="field_char"/>
</t>
<t t-name="SearchView.extended_search.proposition.empty">
<span t-att-id="element_id"></span>
<span t-att-id="widget.element_id"></span>
</t>
<t t-name="SearchView.extended_search.proposition.integer">
<input type="number" t-att-id="element_id" class="field_integer" step="1"/>
<input type="number" t-att-id="widget.element_id" class="field_integer" step="1"/>
</t>
<t t-name="SearchView.extended_search.proposition.float">
<input type="number" t-att-id="element_id" class="field_float" step="0.01"/>
<input type="number" t-att-id="widget.element_id" class="field_float" step="0.01"/>
</t>
<t t-name="SearchView.extended_search.proposition.boolean">
</t>