Odoo Web (MOVED TO GITHUB)

Merge lp:~openerp-dev/openerp-web/6.1-opw-580005-msh into lp:openerp-web/6.1

  1. 6.1-opw-580005-msh
  2. Merge into 6.1
Proposed by Mohammed Shekha(Open ERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openerp-web/6.1-opw-580005-msh
Merge into: lp:openerp-web/6.1
Diff against target: 12 lines (+1/-1)
1 file modified
addons/web/static/src/js/chrome.js (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/6.1-opw-580005-msh
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+127971@code.launchpad.net

Description of the change

Hello,

Fixed button label missing in warning dialog of change password, click on change password button without filling any field, it will raise warning but button label in that warning dialog is missing.

Thanks.

To post a comment you must log in.

Unmerged revisions

2463. By Mohammed Shekha(Open ERP)

[FIX]Fixed button label missing in warning dialog.

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/chrome.js'
2--- addons/web/static/src/js/chrome.js 2012-07-05 10:27:24 +0000
3+++ addons/web/static/src/js/chrome.js 2012-10-04 09:54:23 +0000
4@@ -804,7 +804,7 @@
5 modal: true,
6 title: error.title,
7 buttons: [
8- {text: _("Ok"), click: function() { $(this).dialog("close"); }}
9+ {text: _t("Ok"), click: function() { $(this).dialog("close"); }}
10 ]
11 }).html(error.error);
12 },