summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorAaron Bohy <aab@odoo.com>2017-03-03 12:14:25 +0100
committerAaron Bohy <aab@odoo.com>2017-04-11 19:44:38 +0200
commit2e540eb3c1c712adfaaa23b497c6ae39494ab372 (patch)
tree872091f6c28253c3c3d077a9cbbb8f19cba4952f /addons/web/static/src
parent8d2336abb340d06c64ff62c398e4ec7f7eabe54c (diff)
[FIX] *: apply changes from web_studio
The new views and widgets (at least some of them) first landed in web_studio (v10), and they we moved later to web, so changes in web_studio need to be applied in web.
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/js/fields/basic_fields.js20
-rw-r--r--addons/web/static/src/js/fields/relational_fields.js1
-rw-r--r--addons/web/static/src/js/fields/upgrade_fields.js2
-rw-r--r--addons/web/static/src/js/views/kanban/kanban_record.js51
4 files changed, 45 insertions, 29 deletions
diff --git a/addons/web/static/src/js/fields/basic_fields.js b/addons/web/static/src/js/fields/basic_fields.js
index af2fdb50349..15bb042c072 100644
--- a/addons/web/static/src/js/fields/basic_fields.js
+++ b/addons/web/static/src/js/fields/basic_fields.js
@@ -117,7 +117,7 @@ var InputField = AbstractField.extend({
});
var FieldChar = InputField.extend({
- supportedFieldTypes: ['char', 'text'],
+ supportedFieldTypes: ['char'],
tagName: 'span',
});
@@ -125,7 +125,7 @@ var FieldDate = InputField.extend({
className: "o_form_field_date",
tagName: "span",
replace_element: true,
- supportedFieldTypes: ['date', 'datetime'],
+ supportedFieldTypes: ['date'],
start: function () {
var self = this;
@@ -711,7 +711,11 @@ var PriorityWidget = AbstractField.extend({
this._setValue(new_value);
},
},
- supportedFieldTypes: ['integer'],
+ supportedFieldTypes: ['selection'],
+
+ is_set: function() {
+ return true;
+ },
render_star: function (tag, is_full, value, tip) {
return $(tag)
.attr('title', tip)
@@ -722,11 +726,13 @@ var PriorityWidget = AbstractField.extend({
},
_render: function () {
var self = this;
- var value = parseInt(this.value, 10);
+ var index_value = this.value ? _.findIndex(this.field.selection, function (v) {
+ return v[0] === self.value;
+ }) : 0;
this.$el.empty();
this.empty_value = this.field.selection[0][0];
- _.each(this.field.selection.slice(1), function (choice) {
- self.$el.append(self.render_star('<a href="#">', value >= parseInt(choice[0]), choice[0], choice[1]));
+ _.each(this.field.selection.slice(1), function(choice, index) {
+ self.$el.append(self.render_star('<a href="#">', index_value >= index+1, choice[1]));
});
},
});
@@ -851,7 +857,7 @@ var FieldBooleanButton = AbstractField.extend({
});
var FieldID = InputField.extend({
- supportedFieldTypes: ['integer'],
+ supportedFieldTypes: ['id'],
init: function () {
this._super.apply(this, arguments);
this.mode = 'readonly';
diff --git a/addons/web/static/src/js/fields/relational_fields.js b/addons/web/static/src/js/fields/relational_fields.js
index 460f66ff66f..3f20d802209 100644
--- a/addons/web/static/src/js/fields/relational_fields.js
+++ b/addons/web/static/src/js/fields/relational_fields.js
@@ -117,6 +117,7 @@ var FieldMany2One = AbstractRelationalField.extend({
'click .o_external_button': '_onExternalButtonClick',
'click': '_onClick',
}),
+ supported_field_types: ['many2one'],
init: function () {
this._super.apply(this, arguments);
diff --git a/addons/web/static/src/js/fields/upgrade_fields.js b/addons/web/static/src/js/fields/upgrade_fields.js
index 8d72cecf391..bbfd9b5b5d1 100644
--- a/addons/web/static/src/js/fields/upgrade_fields.js
+++ b/addons/web/static/src/js/fields/upgrade_fields.js
@@ -119,6 +119,7 @@ var UpgradeBoolean = FieldBoolean.extend(AbstractFieldUpgrade, {
events: _.extend({}, FieldBoolean.prototype.events, {
'click input': '_onInputClicked',
}),
+ supported_field_types: [],
//--------------------------------------------------------------------------
// Private
@@ -142,6 +143,7 @@ var UpgradeRadio = FieldRadio.extend(AbstractFieldUpgrade, {
events: _.extend({}, FieldRadio.prototype.events, {
'click input:last': '_onInputClicked',
}),
+ supported_field_types: [],
//--------------------------------------------------------------------------
// Public
diff --git a/addons/web/static/src/js/views/kanban/kanban_record.js b/addons/web/static/src/js/views/kanban/kanban_record.js
index b2b170851e8..2527592c36e 100644
--- a/addons/web/static/src/js/views/kanban/kanban_record.js
+++ b/addons/web/static/src/js/views/kanban/kanban_record.js
@@ -7,11 +7,11 @@ var field_registry = require('web.field_registry');
var field_utils = require('web.field_utils');
var framework = require('web.framework');
var session = require('web.session');
-var time = require('web.time');
var utils = require('web.utils');
var Widget = require('web.Widget');
var QWeb = core.qweb;
+var _t = core._t;
var KanbanRecord = Widget.extend({
template: 'KanbanView.record',
@@ -96,27 +96,34 @@ var KanbanRecord = Widget.extend({
// the widget doesn't exist yet, so instanciate it
var Widget = field_registry.getAny(['kanban.' + field_widget, field_widget]);
- // some field's attrs might be record dependent (they start with
- // 't-att-') and should thus be evaluated, which is done by qweb
- // we here replace those attrs in the dict of attrs of the state
- // by their evaluted value, to make it transparent from the
- // field's widgets point of view
- // that dict being shared between records, we don't modify it
- // in place
- var attrs = Object.create(null);
- _.each(self.state.fieldAttrs[field_name], function (value, key) {
- if (_.str.startsWith(key, 't-att-')) {
- key = key.slice(6);
- value = $field.attr(key);
- }
- attrs[key] = value;
- });
- self.state.fieldAttrs[field_name] = attrs;
-
- widget = new Widget(self, field_name, self.state, self.options);
- self.sub_widgets[field_name] = widget;
- self._set_field_display(widget, field_name);
- widget.replace($field);
+ if (Widget) {
+ // some field's attrs might be record dependent (they start with
+ // 't-att-') and should thus be evaluated, which is done by qweb
+ // we here replace those attrs in the dict of attrs of the state
+ // by their evaluted value, to make it transparent from the
+ // field's widgets point of view
+ // that dict being shared between records, we don't modify it
+ // in place
+ var attrs = Object.create(null);
+ _.each(self.state.fieldAttrs[field_name], function (value, key) {
+ if (_.str.startsWith(key, 't-att-')) {
+ key = key.slice(6);
+ value = $field.attr(key);
+ }
+ attrs[key] = value;
+ });
+ self.state.fieldAttrs[field_name] = attrs;
+
+ widget = new Widget(self, field_name, self.state, self.options);
+ self.sub_widgets[field_name] = widget;
+ self._set_field_display(widget, field_name);
+ widget.replace($field);
+ } else if (core.debug) {
+ // the widget is not implemented
+ $field.replaceWith($('<span>', {
+ text: _.str.sprintf(_t('[No widget %s]'), field_widget),
+ }));
+ }
} else {
// a widget already exists for that field, so reset it with the new state
widget.reset(self.state);