[imp] used datetime widget in advanced search
bzr revid: nicolas.vanhoren@openerp.com-20110921120347-rx8xhwa4igswtsx7
This commit is contained in:
parent
7d65aca167
commit
e281efe866
|
@ -896,6 +896,10 @@ label.error {
|
||||||
}
|
}
|
||||||
.openerp .oe_datepicker {
|
.openerp .oe_datepicker {
|
||||||
position: relative;
|
position: relative;
|
||||||
|
display: inline-block;
|
||||||
|
}
|
||||||
|
.openerp .oe_datepicker input[type="text"] {
|
||||||
|
min-width: 160px;
|
||||||
}
|
}
|
||||||
.openerp .oe_input_icon_disabled {
|
.openerp .oe_input_icon_disabled {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
|
|
|
@ -803,9 +803,6 @@ openerp.web.search.DateField = openerp.web.search.Field.extend(/** @lends opener
|
||||||
this.attrs.default_focus === '1' ? 'autofocus' : undefined);
|
this.attrs.default_focus === '1' ? 'autofocus' : undefined);
|
||||||
this.datewidget.set_value(this.defaults[this.attrs.name] || false);
|
this.datewidget.set_value(this.defaults[this.attrs.name] || false);
|
||||||
},
|
},
|
||||||
stop: function () {
|
|
||||||
this.$element.datepicker('destroy');
|
|
||||||
},
|
|
||||||
get_value: function () {
|
get_value: function () {
|
||||||
return this.datewidget.get_value() || null;
|
return this.datewidget.get_value() || null;
|
||||||
}
|
}
|
||||||
|
@ -1122,7 +1119,7 @@ openerp.web.search.ExtendedSearchProposition.Char = openerp.web.OldWidget.extend
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
openerp.web.search.ExtendedSearchProposition.DateTime = openerp.web.OldWidget.extend({
|
openerp.web.search.ExtendedSearchProposition.DateTime = openerp.web.OldWidget.extend({
|
||||||
template: 'SearchView.extended_search.proposition.datetime',
|
template: 'SearchView.extended_search.proposition.empty',
|
||||||
identifier_prefix: 'extended-search-proposition-datetime',
|
identifier_prefix: 'extended-search-proposition-datetime',
|
||||||
operators: [
|
operators: [
|
||||||
{value: "=", text: "is equal to"},
|
{value: "=", text: "is equal to"},
|
||||||
|
@ -1133,18 +1130,16 @@ openerp.web.search.ExtendedSearchProposition.DateTime = openerp.web.OldWidget.ex
|
||||||
{value: "<=", text: "less or equal than"}
|
{value: "<=", text: "less or equal than"}
|
||||||
],
|
],
|
||||||
get_value: function() {
|
get_value: function() {
|
||||||
return this.$element.val();
|
return this.datewidget.get_value();
|
||||||
},
|
},
|
||||||
start: function() {
|
start: function() {
|
||||||
this._super();
|
this._super();
|
||||||
this.$element.datetimepicker({
|
this.datewidget = new openerp.web.DateTimeWidget(this);
|
||||||
dateFormat: 'yy-mm-dd',
|
this.datewidget.prependTo(this.$element);
|
||||||
timeFormat: 'hh:mm:ss'
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
openerp.web.search.ExtendedSearchProposition.Date = openerp.web.OldWidget.extend({
|
openerp.web.search.ExtendedSearchProposition.Date = openerp.web.OldWidget.extend({
|
||||||
template: 'SearchView.extended_search.proposition.date',
|
template: 'SearchView.extended_search.proposition.empty',
|
||||||
identifier_prefix: 'extended-search-proposition-date',
|
identifier_prefix: 'extended-search-proposition-date',
|
||||||
operators: [
|
operators: [
|
||||||
{value: "=", text: "is equal to"},
|
{value: "=", text: "is equal to"},
|
||||||
|
@ -1155,14 +1150,12 @@ openerp.web.search.ExtendedSearchProposition.Date = openerp.web.OldWidget.extend
|
||||||
{value: "<=", text: "less or equal than"}
|
{value: "<=", text: "less or equal than"}
|
||||||
],
|
],
|
||||||
get_value: function() {
|
get_value: function() {
|
||||||
return this.$element.val();
|
return this.datewidget.get_value();
|
||||||
},
|
},
|
||||||
start: function() {
|
start: function() {
|
||||||
this._super();
|
this._super();
|
||||||
this.$element.datepicker({
|
this.datewidget = new openerp.web.DateWidget(this);
|
||||||
dateFormat: 'yy-mm-dd',
|
this.datewidget.prependTo(this.$element);
|
||||||
timeFormat: 'hh:mm:ss'
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
openerp.web.search.ExtendedSearchProposition.Integer = openerp.web.OldWidget.extend({
|
openerp.web.search.ExtendedSearchProposition.Integer = openerp.web.OldWidget.extend({
|
||||||
|
|
|
@ -1156,11 +1156,8 @@
|
||||||
<t t-name="SearchView.extended_search.proposition.char">
|
<t t-name="SearchView.extended_search.proposition.char">
|
||||||
<input t-att-id="element_id" class="field_char"/>
|
<input t-att-id="element_id" class="field_char"/>
|
||||||
</t>
|
</t>
|
||||||
<t t-name="SearchView.extended_search.proposition.datetime">
|
<t t-name="SearchView.extended_search.proposition.empty">
|
||||||
<input t-att-id="element_id" class="field_datetime"/>
|
<span t-att-id="element_id"></span>
|
||||||
</t>
|
|
||||||
<t t-name="SearchView.extended_search.proposition.date">
|
|
||||||
<input t-att-id="element_id" class="field_date"/>
|
|
||||||
</t>
|
</t>
|
||||||
<t t-name="SearchView.extended_search.proposition.integer">
|
<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="element_id" class="field_integer" step="1"/>
|
||||||
|
|
Loading…
Reference in New Issue