Odoo Web (MOVED TO GITHUB)

Merge lp:~openerp-dev/openerp-web/trunk-bug-1002166-vja into lp:openerp-web

  1. trunk-bug-1002166-vja
  2. Merge into trunk
Proposed by Vishmita Jadeja (openerp)
Status: Merged
Merged at revision: 2515
Proposed branch: lp:~openerp-dev/openerp-web/trunk-bug-1002166-vja
Merge into: lp:openerp-web
Diff against target: 13 lines (+2/-1)
1 file modified
addons/web/static/src/js/view_form.js (+2/-1)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/trunk-bug-1002166-vja
Reviewer Review Type Date Requested Status
Nicolas Vanhoren (OpenERP) (community) Approve
Review via email: mp+106747@code.launchpad.net

Description of the change

put correct template name.

To post a comment you must log in.
Revision history for this message
Nicolas Vanhoren (OpenERP) (niv-openerp) wrote :

Seems ok, solves the bug.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/web/static/src/js/view_form.js'
2--- addons/web/static/src/js/view_form.js 2012-05-16 14:52:31 +0000
3+++ addons/web/static/src/js/view_form.js 2012-05-22 06:38:18 +0000
4@@ -495,7 +495,8 @@
5 this.on_form_changed();
6 }
7 if (!_.isEmpty(result.warning)) {
8- instance.web.dialog($(QWeb.render("CrashManagerWarning", result.warning)), {
9+ instance.web.dialog($(QWeb.render("CrashManager.warning", result.warning)), {
10+ title:result.warning.title,
11 modal: true,
12 buttons: [
13 {text: _t("Ok"), click: function() { $(this).dialog("close"); }}