Odoo Web (MOVED TO GITHUB)

Merge lp:~openerp-dev/openerp-web/trunk-reactivate_closed_contract-jpr into lp:openerp-web

  1. trunk-reactivate_closed_contract-jpr
  2. Merge into trunk
Proposed by Harry (OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openerp-web/trunk-reactivate_closed_contract-jpr
Merge into: lp:openerp-web
Diff against target: 28 lines (+3/-3)
1 file modified
addons/web/static/src/js/chrome.js (+3/-3)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/trunk-reactivate_closed_contract-jpr
Reviewer Review Type Date Requested Status
OpenERP R&D Web Team Pending
Review via email: mp+217195@code.launchpad.net
To post a comment you must log in.
lp:~openerp-dev/openerp-web/trunk-reactivate_closed_contract-jpr updated
3988. By Jitendra Prajapati(OpenERP)

[MERGE]with main branch

3989. By Jitendra Prajapati(OpenERP)

[MERGE]sync main branch

3990. By Jitendra Prajapati(OpenERP)

[MERGE]sync main branch

Unmerged revisions

3990. By Jitendra Prajapati(OpenERP)

[MERGE]sync main branch

3989. By Jitendra Prajapati(OpenERP)

[MERGE]sync main branch

3988. By Jitendra Prajapati(OpenERP)

[MERGE]with main branch

3987. By Jitendra Prajapati(OpenERP)

[MERGE]with main branch

3986. By Jitendra Prajapati(OpenERP)

[MERGE]with main branch

3985. By Jitendra Prajapati(OpenERP)

[FIX]Fixed the issue of warning message in that warning popup was not working.

3984. By Jitendra Prajapati(OpenERP)

[MERGE]with main branch

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 2014-05-12 08:10:32 +0000
3+++ addons/web/static/src/js/chrome.js 2014-05-13 10:10:38 +0000
4@@ -324,6 +324,7 @@
5 this.error = error;
6 },
7 display: function() {
8+ var self = this;
9 error = this.error;
10 error.data.message = error.data.arguments[0];
11
12@@ -331,14 +332,13 @@
13 size: 'medium',
14 title: "OpenERP " + (_.str.capitalize(error.type) || "Warning"),
15 buttons: [
16- {text: _t("Ok"), click: function() { this.$el.parents('.modal').modal('hide'); }},
17+ {text: _t("Ok"), click: function() { self.$el.parents('.modal').modal('hide'); self.destroy();}},
18 {text: error.data.arguments[2], click: function() {
19 window.location.href='#action='+error.data.arguments[1];
20- this.$el.parents('.modal').modal('hide');
21+ self.destroy();
22 }}
23 ],
24 }, QWeb.render('CrashManager.warning', {error: error})).open();
25- this.destroy();
26 }
27 });
28 instance.web.crash_manager_registry.add('openerp.exceptions.RedirectWarning', 'instance.web.RedirectWarningHandler');