[MERGE] forward port branch saas-16 up to dc2a6c6cd2
This commit is contained in:
@@ -394,7 +394,7 @@ var LinkButton = AbstractField.extend({
|
||||
var FieldDate = InputField.extend({
|
||||
className: "o_field_date",
|
||||
tagName: "span",
|
||||
supportedFieldTypes: ['date'],
|
||||
supportedFieldTypes: ['date', 'datetime'],
|
||||
|
||||
/**
|
||||
* @override
|
||||
@@ -453,12 +453,13 @@ var FieldDate = InputField.extend({
|
||||
* @override
|
||||
* @private
|
||||
* @param {Moment|false} value
|
||||
* @returns {boolean}
|
||||
*/
|
||||
_isSameValue: function (value) {
|
||||
if (value === false) {
|
||||
return this.value === false;
|
||||
}
|
||||
return value.isSame(this.value);
|
||||
return value.isSame(this.value, 'day');
|
||||
},
|
||||
/**
|
||||
* Instantiates a new DateWidget datepicker.
|
||||
@@ -497,7 +498,16 @@ var FieldDateTime = FieldDate.extend({
|
||||
var value = this.datewidget.getValue();
|
||||
return value && value.add(-this.getSession().getTZOffset(value), 'minutes');
|
||||
},
|
||||
|
||||
/**
|
||||
* @override
|
||||
* @private
|
||||
*/
|
||||
_isSameValue: function (value) {
|
||||
if (value === false) {
|
||||
return this.value === false;
|
||||
}
|
||||
return value.isSame(this.value);
|
||||
},
|
||||
/**
|
||||
* Instantiates a new DateTimeWidget datepicker rather than DateWidget.
|
||||
*
|
||||
@@ -1171,7 +1181,6 @@ var FieldBinaryImage = AbstractFieldBinary.extend({
|
||||
supportedFieldTypes: ['binary'],
|
||||
_render: function () {
|
||||
var self = this;
|
||||
var attrs = this.attrs;
|
||||
var url = this.placeholder;
|
||||
if (this.value) {
|
||||
if (!utils.is_bin_size(this.value)) {
|
||||
@@ -1186,11 +1195,7 @@ var FieldBinaryImage = AbstractFieldBinary.extend({
|
||||
});
|
||||
}
|
||||
}
|
||||
var $img = $('<img>').attr('src', url);
|
||||
$img.css({
|
||||
width: this.nodeOptions.size ? this.nodeOptions.size[0] : attrs.img_width || attrs.width,
|
||||
height: this.nodeOptions.size ? this.nodeOptions.size[1] : attrs.img_height || attrs.height,
|
||||
});
|
||||
var $img = $(qweb.render("FieldBinaryImage-img", {widget: this, url: url}));
|
||||
this.$('> img').remove();
|
||||
this.$el.prepend($img);
|
||||
$img.on('error', function () {
|
||||
@@ -2174,6 +2179,15 @@ var FieldDomain = AbstractField.extend({
|
||||
// Public
|
||||
//--------------------------------------------------------------------------
|
||||
|
||||
/**
|
||||
* A domain field is always set since the false value is considered to be
|
||||
* equal to "[]" (match all records).
|
||||
*
|
||||
* @override
|
||||
*/
|
||||
isSet: function () {
|
||||
return true;
|
||||
},
|
||||
/**
|
||||
* @override isValid from AbstractField.isValid
|
||||
* Parsing the char value is not enough for this field. It is considered
|
||||
|
||||
Reference in New Issue
Block a user