From 6b7ccc16b7883367ef4810a823ba66b85e725b06 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Mon, 28 Oct 2013 14:50:50 +0100 Subject: [PATCH 001/106] [FIX] mail: mail_message: avoid crash when checking access rules against invalid ids bzr revid: chs@openerp.com-20131028135050-4hqx129ouy7z5b03 --- addons/mail/mail_message.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py index 3719dbc1c63..de8e4c68fda 100644 --- a/addons/mail/mail_message.py +++ b/addons/mail/mail_message.py @@ -212,7 +212,7 @@ class mail_message(osv.Model): _defaults = { 'type': 'email', - 'date': fields.datetime.now(), + 'date': fields.datetime.now, 'author_id': lambda self, cr, uid, ctx=None: self._get_default_author(cr, uid, ctx), 'body': '', 'email_from': lambda self, cr, uid, ctx=None: self._get_default_from(cr, uid, ctx), @@ -698,8 +698,9 @@ class mail_message(osv.Model): """ model_record_ids = {} for id in msg_ids: - if msg_val[id]['model'] and msg_val[id]['res_id']: - model_record_ids.setdefault(msg_val[id]['model'], dict()).setdefault(msg_val[id]['res_id'], set()).add(msg_val[id]['res_id']) + vals = msg_val.get(id, {}) + if vals.get('model') and vals.get('res_id'): + model_record_ids.setdefault(vals['model'], set()).add(vals['res_id']) return model_record_ids if uid == SUPERUSER_ID: @@ -711,7 +712,7 @@ class mail_message(osv.Model): partner_id = self.pool['res.users'].browse(cr, SUPERUSER_ID, uid, context=None).partner_id.id # Read mail_message.ids to have their values - message_values = dict.fromkeys(ids) + message_values = dict.fromkeys(ids, {}) cr.execute('SELECT DISTINCT id, model, res_id, author_id, parent_id FROM "%s" WHERE id = ANY (%%s)' % self._table, (ids,)) for id, rmod, rid, author_id, parent_id in cr.fetchall(): message_values[id] = {'model': rmod, 'res_id': rid, 'author_id': author_id, 'parent_id': parent_id} @@ -745,10 +746,10 @@ class mail_message(osv.Model): ], context=context) notified_ids = [notification.message_id.id for notification in not_obj.browse(cr, SUPERUSER_ID, not_ids, context=context)] elif operation == 'create': - for doc_model, doc_dict in model_record_ids.items(): + for doc_model, doc_ids in model_record_ids.items(): fol_ids = fol_obj.search(cr, SUPERUSER_ID, [ ('res_model', '=', doc_model), - ('res_id', 'in', list(doc_dict.keys())), + ('res_id', 'in', list(doc_ids)), ('partner_id', '=', partner_id), ], context=context) fol_mids = [follower.res_id for follower in fol_obj.browse(cr, SUPERUSER_ID, fol_ids, context=context)] @@ -759,9 +760,9 @@ class mail_message(osv.Model): other_ids = other_ids.difference(set(notified_ids)) model_record_ids = _generate_model_record_ids(message_values, other_ids) document_related_ids = [] - for model, doc_dict in model_record_ids.items(): + for model, doc_ids in model_record_ids.items(): model_obj = self.pool[model] - mids = model_obj.exists(cr, uid, doc_dict.keys()) + mids = model_obj.exists(cr, uid, list(doc_ids)) if hasattr(model_obj, 'check_mail_message_access'): model_obj.check_mail_message_access(cr, uid, mids, operation, context=context) else: From 7c3ae6a157efaecf8fffea4d3eb9732d3826e531 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Mon, 28 Oct 2013 16:00:19 +0100 Subject: [PATCH 002/106] [FIX] Rare problem in select fields related to previous improvement in that widget. Sometimes, the value of the field was resetted to false. bzr revid: nicolas.vanhoren@openerp.com-20131028150019-i0nllpqu1i7wpxbr --- addons/web/static/src/js/view_form.js | 34 +++++++++++---------------- addons/web/static/src/xml/base.xml | 7 +++--- 2 files changed, 17 insertions(+), 24 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 1fa7cb6a4f8..2cb318dcb17 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2804,7 +2804,7 @@ instance.web.form.FieldSelection = instance.web.form.AbstractField.extend(instan var self = this; this._super(field_manager, node); this.set("value", false); - this.set("values", [[false, '']]); + this.set("values", []); this.records_orderer = new instance.web.DropMisordered(); this.field_manager.on("view_content_has_changed", this, function() { var domain = new openerp.web.CompoundDomain(this.build_domain()).eval(); @@ -2826,14 +2826,9 @@ instance.web.form.FieldSelection = instance.web.form.AbstractField.extend(instan var model = new openerp.Model(openerp.session, this.field.relation); def = model.call("search", [this.get("domain")], {"context": this.build_context()}).then(function(record_ids) { return model.call("name_get", [record_ids] , {"context": self.build_context()}); - }).then(function(res) { - return [[false, '']].concat(res); }); } else { - var values = _(this.field.selection).chain() - .reject(function (v) { return v[0] === false && v[1] === ''; }) - .unshift([false, '']) - .value(); + var values = _.reject(this.field.selection, function (v) { return v[0] === false && v[1] === ''; }); def = $.when(values); } this.records_orderer.add(def).then(function(values) { @@ -2871,8 +2866,8 @@ instance.web.form.FieldSelection = instance.web.form.AbstractField.extend(instan }, store_dom_value: function () { if (!this.get('effective_readonly') && this.$('select').length) { - this.internal_set_value( - this.get("values")[this.$('select')[0].selectedIndex][0]); + var val = JSON.parse(this.$('select').val()); + this.internal_set_value(val); } }, set_value: function(value_) { @@ -2881,19 +2876,18 @@ instance.web.form.FieldSelection = instance.web.form.AbstractField.extend(instan this._super(value_); }, render_value: function() { + var values = this.get("values"); + values = [[false, this.node.attrs.placeholder || '']].concat(values); + var found = _.find(values, function(el) { return el[0] === this.get("value"); }, this); + if (! found) { + found = [this.get("value"), _t('Unknown')]; + values = [found].concat(values); + } if (! this.get("effective_readonly")) { - this.$().html(QWeb.render("FieldSelectionSelect", {widget: this})); - var index = 0; - _.each(this.get("values"), function(el, i) { - if (el[0] === this.get('value')) - index = i; - }, this); - this.$el.find('select')[0].selectedIndex = index; + this.$().html(QWeb.render("FieldSelectionSelect", {widget: this, values: values})); + this.$("select").val(JSON.stringify(found[0])); } else { - var self = this; - var option = _(this.get("values")) - .detect(function (record) { return record[0] === self.get('value'); }); - this.$el.text(option ? option[1] : this.get("values")[0][1]); + this.$el.text(found[1]); } }, focus: function() { diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 513e42bf899..cd96e9648a8 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1107,10 +1107,9 @@ t-att-tabindex="widget.node.attrs.tabindex" t-att-autofocus="widget.node.attrs.autofocus" t-att-id="widget.id_for_label"> - -