From 6acccf6d6a4f79452ca93bbf4630590cb1bc39f6 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 30 Jul 2012 18:05:38 +0200 Subject: [PATCH] [IMP] FormView: use name_get for the form title bzr revid: fme@openerp.com-20120730160538-ankpno3upsrnt8y1 --- addons/web/static/src/js/view_form.js | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 7f802be2100..469df4b9131 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -302,7 +302,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM this._super(); }, on_record_loaded: function(record) { - var self = this, set_values = []; + var self = this, defs = []; if (!record) { this.set({ 'title' : undefined }); this.do_warn("Form", "The record could not be found in the database.", true); @@ -310,7 +310,19 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM } this.datarecord = record; this._actualize_mode(); - this.set({ 'title' : record.id ? record.name : "New record" }); + + var titleDef = $.Deferred(); + if (record.id) { + this.dataset.name_get(record.id).then(function(names) { + self.set({ 'title' : names[0][1] }); + }).always(function() { + titleDef.resolve(); + }); + } else { + this.set({ 'title' : "New record" }); + titleDef.resolve(); + } + defs.push(titleDef); if (this.qweb) { this.kill_current_form(); @@ -322,9 +334,9 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM _(this.fields).each(function (field, f) { field._dirty_flag = false; var result = field.set_value(self.datarecord[f] || false); - set_values.push(result); + defs.push(result); }); - return $.when.apply(null, set_values).pipe(function() { + return $.when.apply(null, defs).pipe(function() { if (!record.id) { // New record: Second pass in order to trigger the onchanges // respecting the fields order defined in the view