[imp] some more cosmetic improvements
bzr revid: nicolas.vanhoren@openerp.com-20120418124520-f3hbmwn6bk50pfrt
This commit is contained in:
parent
c0bdcbc778
commit
5dfffbd820
|
@ -1781,8 +1781,8 @@ instance.web.form.ReinitializeFieldMixin = {
|
||||||
|
|
||||||
instance.web.form.FieldChar = instance.web.form.AbstractField.extend(_.extend({}, instance.web.form.ReinitializeFieldMixin, {
|
instance.web.form.FieldChar = instance.web.form.AbstractField.extend(_.extend({}, instance.web.form.ReinitializeFieldMixin, {
|
||||||
template: 'FieldChar',
|
template: 'FieldChar',
|
||||||
init: function (view, node) {
|
init: function (field_manager, node) {
|
||||||
this._super(view, node);
|
this._super(field_manager, node);
|
||||||
this.password = this.node.attrs.password === 'True' || this.node.attrs.password === '1';
|
this.password = this.node.attrs.password === 'True' || this.node.attrs.password === '1';
|
||||||
},
|
},
|
||||||
initialize_content: function() {
|
initialize_content: function() {
|
||||||
|
@ -1885,8 +1885,8 @@ instance.web.form.FieldUrl = instance.web.form.FieldChar.extend({
|
||||||
|
|
||||||
instance.web.form.FieldFloat = instance.web.form.FieldChar.extend({
|
instance.web.form.FieldFloat = instance.web.form.FieldChar.extend({
|
||||||
is_field_number: true,
|
is_field_number: true,
|
||||||
init: function (view, node) {
|
init: function (field_manager, node) {
|
||||||
this._super(view, node);
|
this._super(field_manager, node);
|
||||||
this.set({'value': 0});
|
this.set({'value': 0});
|
||||||
if (this.node.attrs.digits) {
|
if (this.node.attrs.digits) {
|
||||||
this.digits = py.eval(node.attrs.digits);
|
this.digits = py.eval(node.attrs.digits);
|
||||||
|
@ -2156,9 +2156,9 @@ instance.web.form.FieldTextXml = instance.web.form.AbstractField.extend({
|
||||||
|
|
||||||
instance.web.form.FieldSelection = instance.web.form.AbstractField.extend(_.extend({}, instance.web.form.ReinitializeFieldMixin, {
|
instance.web.form.FieldSelection = instance.web.form.AbstractField.extend(_.extend({}, instance.web.form.ReinitializeFieldMixin, {
|
||||||
template: 'FieldSelection',
|
template: 'FieldSelection',
|
||||||
init: function(view, node) {
|
init: function(field_manager, node) {
|
||||||
var self = this;
|
var self = this;
|
||||||
this._super(view, node);
|
this._super(field_manager, node);
|
||||||
this.values = _.clone(this.field.selection);
|
this.values = _.clone(this.field.selection);
|
||||||
_.each(this.values, function(v, i) {
|
_.each(this.values, function(v, i) {
|
||||||
if (v[0] === false && v[1] === '') {
|
if (v[0] === false && v[1] === '') {
|
||||||
|
@ -2268,8 +2268,8 @@ instance.web.form.dialog = function(content, options) {
|
||||||
|
|
||||||
instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(_.extend({}, instance.web.form.ReinitializeFieldMixin, {
|
instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(_.extend({}, instance.web.form.ReinitializeFieldMixin, {
|
||||||
template: "FieldMany2One",
|
template: "FieldMany2One",
|
||||||
init: function(view, node) {
|
init: function(field_manager, node) {
|
||||||
this._super(view, node);
|
this._super(field_manager, node);
|
||||||
this.limit = 7;
|
this.limit = 7;
|
||||||
this.set({'value': false});
|
this.set({'value': false});
|
||||||
this.display_value = {};
|
this.display_value = {};
|
||||||
|
@ -2617,8 +2617,8 @@ var commands = {
|
||||||
instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
|
instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
|
||||||
multi_selection: false,
|
multi_selection: false,
|
||||||
disable_utility_classes: true,
|
disable_utility_classes: true,
|
||||||
init: function(view, node) {
|
init: function(field_manager, node) {
|
||||||
this._super(view, node);
|
this._super(field_manager, node);
|
||||||
lazy_build_o2m_kanban_view();
|
lazy_build_o2m_kanban_view();
|
||||||
this.is_loaded = $.Deferred();
|
this.is_loaded = $.Deferred();
|
||||||
this.initial_is_loaded = this.is_loaded;
|
this.initial_is_loaded = this.is_loaded;
|
||||||
|
@ -3006,8 +3006,8 @@ instance.web.form.One2ManyKanbanView = instance.web_kanban.KanbanView.extend({
|
||||||
instance.web.form.FieldMany2Many = instance.web.form.AbstractField.extend({
|
instance.web.form.FieldMany2Many = instance.web.form.AbstractField.extend({
|
||||||
multi_selection: false,
|
multi_selection: false,
|
||||||
disable_utility_classes: true,
|
disable_utility_classes: true,
|
||||||
init: function(view, node) {
|
init: function(field_manager, node) {
|
||||||
this._super(view, node);
|
this._super(field_manager, node);
|
||||||
this.is_loaded = $.Deferred();
|
this.is_loaded = $.Deferred();
|
||||||
this.initial_is_loaded = this.is_loaded;
|
this.initial_is_loaded = this.is_loaded;
|
||||||
this.is_setted = $.Deferred();
|
this.is_setted = $.Deferred();
|
||||||
|
@ -3446,20 +3446,20 @@ instance.web.form.FormOpenDataset = instance.web.ProxyDataSet.extend({
|
||||||
|
|
||||||
instance.web.form.FieldReference = instance.web.form.AbstractField.extend(_.extend({}, instance.web.form.ReinitializeFieldMixin, {
|
instance.web.form.FieldReference = instance.web.form.AbstractField.extend(_.extend({}, instance.web.form.ReinitializeFieldMixin, {
|
||||||
template: 'FieldReference',
|
template: 'FieldReference',
|
||||||
init: function(view, node) {
|
init: function(field_manager, node) {
|
||||||
this._super(view, node);
|
this._super(field_manager, node);
|
||||||
this.fields_view = {
|
this.fields_view = {
|
||||||
fields: {
|
fields: {
|
||||||
selection: {
|
selection: {
|
||||||
selection: view.fields_view.fields[this.name].selection
|
selection: this.view.fields_view.fields[this.name].selection
|
||||||
},
|
},
|
||||||
m2o: {
|
m2o: {
|
||||||
relation: null
|
relation: null
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
this.get_fields_values = view.get_fields_values;
|
this.get_fields_values = this.view.get_fields_values;
|
||||||
this.get_selected_ids = view.get_selected_ids;
|
this.get_selected_ids = this.view.get_selected_ids;
|
||||||
this.do_onchange = this.on_form_changed = this.do_notify_change = this.on_nop;
|
this.do_onchange = this.on_form_changed = this.do_notify_change = this.on_nop;
|
||||||
this.dataset = this.view.dataset;
|
this.dataset = this.view.dataset;
|
||||||
this.view_id = 'reference_' + _.uniqueId();
|
this.view_id = 'reference_' + _.uniqueId();
|
||||||
|
@ -3543,8 +3543,8 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(_.exte
|
||||||
}));
|
}));
|
||||||
|
|
||||||
instance.web.form.FieldBinary = instance.web.form.AbstractField.extend(_.extend({}, instance.web.form.ReinitializeFieldMixin, {
|
instance.web.form.FieldBinary = instance.web.form.AbstractField.extend(_.extend({}, instance.web.form.ReinitializeFieldMixin, {
|
||||||
init: function(view, node) {
|
init: function(field_manager, node) {
|
||||||
this._super(view, node);
|
this._super(field_manager, node);
|
||||||
this.iframe = this.element_id + '_iframe';
|
this.iframe = this.element_id + '_iframe';
|
||||||
this.binary_value = false;
|
this.binary_value = false;
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue