Yogesh(Open ERP) has proposed merging
lp:~openerp-dev/openerp-web/trunk-bug-878033-ysa into lp:openerp-web.
Requested reviews:
OpenERP R&D Web Team (openerp-dev-web)
Related bugs:
Bug #878033 in OpenERP Web: "[RC1] errors popping up with web server -
reports uom_id missing"
https://bugs.launchpad.net/openerp-web/+bug/878033
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-bug-878033-ysa/+merge/79809
--
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-bug-878033-ysa/+merge/79809
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openerp-web/trunk-bug-878033-ysa.
=== modified file 'addons/web/static/src/js/view_form.js'
--- addons/web/static/src/js/view_form.js 2011-10-18 11:07:40 +0000
+++ addons/web/static/src/js/view_form.js 2011-10-19 12:58:46 +0000
@@ -15,7 +15,7 @@
/**
* @constructs openerp.web.FormView
* @extends openerp.web.View
- *
+ *
* @param {openerp.web.Session} session the current openerp session
* @param {openerp.web.DataSet} dataset the dataset this view will work with
* @param {String} view_id the identifier of the OpenERP view object
@@ -1007,7 +1007,7 @@
},
on_confirmed: function() {
var self = this;
-
+
var context = this.node.attrs.context;
if (context && context.__ref) {
context = new openerp.web.CompoundContext(context);
@@ -2745,13 +2745,13 @@
start: function() {
this._super();
this.selected_value = null;
-
+
this.render_list();
},
set_value: function(value) {
this._super(value);
this.selected_value = value;
-
+
this.render_list();
},
render_list: function() {
@@ -2759,7 +2759,7 @@
var shown = _.map(((this.node.attrs || {}).statusbar_visible || "").split(","),
function(x) { return _.trim(x); });
shown = _.select(shown, function(x) { return x.length > 0; });
-
+
if (shown.length == 0) {
this.to_show = this.field.selection;
} else {
@@ -2767,10 +2767,10 @@
return _.indexOf(shown, x[0]) !== -1 || x[0] === self.selected_value;
});
}
-
+
var content = openerp.web.qweb.render("FieldStatus.content", {widget: this, _:_});
this.$element.html(content);
-
+
var colors = JSON.parse((this.node.attrs || {}).statusbar_colors || "{}");
var color = colors[this.selected_value];
if (color) {
@@ -2872,6 +2872,7 @@
openerp.web.form.FieldMany2OneReadonly = openerp.web.form.FieldCharReadonly.extend({
set_value: function (value) {
value = value || null;
+ this._super(value);
this.invalid = false;
var self = this;
this.tmp_value = value;
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
