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

[FIX] Fixed date & datetime widgets. Using dates.js 

bzr revid: fme@openerp.com-20110512103601-vbfa5or1kydajlmh
This commit is contained in:
Fabien Meghazi 2011-05-12 12:36:01 +02:00
parent 506a93c706
commit aa40e111fa
2 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
addons/base/static/src/js/form.js
View File

@ -679,33 +679,43 @@ openerp.base.form.FieldFloat = openerp.base.form.FieldChar.extend({
}
});
openerp.base.form.FieldDate = openerp.base.form.FieldChar.extend({
openerp.base.form.FieldDatetime = openerp.base.form.Field.extend({
init: function(view, node) {
this._super(view, node);
this.template = "FieldDate";
this.validation_regex = /^\d+-\d+-\d+$/;
this.jqueryui_object = 'datetimepicker';
},
start: function() {
this._super.apply(this, arguments);
this.$element.find('input').change(this.on_ui_change).datepicker({
dateFormat: 'yy-mm-dd'
});
}
});
openerp.base.form.FieldDatetime = openerp.base.form.FieldChar.extend({
init: function(view, node) {
this._super(view, node);
this.template = "FieldDatetime";
this.validation_regex = /^\d+-\d+-\d+( \d+:\d+(:\d+)?)?$/;
},
start: function() {
this._super.apply(this, arguments);
this.$element.find('input').change(this.on_ui_change).datetimepicker({
this.$element.find('input').change(this.on_ui_change)[this.jqueryui_object]({
dateFormat: 'yy-mm-dd',
timeFormat: 'hh:mm:ss'
});
}
},
set_value: function(value) {
this._super.apply(this, arguments);
if (value == null || value == false) {
this.$element.find('input').val('');
} else {
this.value = this.format(value);
this.$element.find('input')[this.jqueryui_object]('setDate', this.value);
}
},
set_value_from_ui: function() {
this.value = this.$element.find('input')[this.jqueryui_object]('getDate') || false;
},
validate: function() {
this.invalid = this.required && this.value === false;
},
format: openerp.base.parse_datetime
});
openerp.base.form.FieldDate = openerp.base.form.FieldDatetime.extend({
init: function(view, node) {
this._super(view, node);
this.jqueryui_object = 'datepicker';
},
format: openerp.base.parse_date
});
openerp.base.form.FieldText = openerp.base.form.Field.extend({

7
addons/base/static/src/xml/base.xml
View File

@ -318,13 +318,6 @@
t-att-class="'field_' + widget.type"
/>
</t>
<t t-name="FieldDatetime">
<input type="text" style="width: 100%"
t-att-name="widget.name"
t-att-id="widget.element_id + '_field'"
t-att-class="'field_' + widget.type"
/>
</t>
<t t-name="FieldSelection">
<select
t-att-name="widget.name"