From 0cc2d915dac5402da06c1e51369499467260de8e Mon Sep 17 00:00:00 2001 From: "Vaibhav (OpenERP)" Date: Thu, 22 Dec 2011 16:54:51 +0530 Subject: [PATCH 1/3] [FIX] wizard action,manage view should not display title. lp bug: https://launchpad.net/bugs/907354 fixed bzr revid: vda@tinyerp.com-20111222112451-b9emqola88y6ufmy --- addons/web/static/src/js/view_editor.js | 3 ++- addons/web/static/src/js/views.js | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index 649f324744d..3f078208fe4 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -27,6 +27,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ target: "current", limit: this.dataset.limit || 80, flags: { + display_title: false, sidebar: false, deletable: false, views_switcher: false, @@ -38,7 +39,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ } }; this.view_edit_dialog = new openerp.web.Dialog(this, { - title: _t("ViewEditor"), + title: _.str.sprintf("Manage Views (%s)", this.model), width: 850, buttons: [ {text: _t("Create"), click: function() { self.on_create_view(); }}, diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index 42298c5c363..e2ef5412e80 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -105,6 +105,7 @@ session.web.ActionManager = session.web.Widget.extend({ var type = action.type.replace(/\./g,'_'); var popup = action.target === 'new'; action.flags = _.extend({ + display_title: !popup, views_switcher : !popup, search_view : !popup, action_buttons : !popup, From 18abd9d57969034a39b23bfd4db9be5f47b4b553 Mon Sep 17 00:00:00 2001 From: "Vaibhav (OpenERP)" Date: Thu, 22 Dec 2011 18:05:04 +0530 Subject: [PATCH 2/3] [FIX] Translatable view editor title. bzr revid: vda@tinyerp.com-20111222123504-j8d64h37r0lds080 --- addons/web/static/src/js/view_editor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index 3f078208fe4..db0d67c7897 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -39,7 +39,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ } }; this.view_edit_dialog = new openerp.web.Dialog(this, { - title: _.str.sprintf("Manage Views (%s)", this.model), + title: _t(_.str.sprintf("Manage Views (%s)", this.model)), width: 850, buttons: [ {text: _t("Create"), click: function() { self.on_create_view(); }}, From 0308d838b3b53bdb5be00b35243db019a9b35f10 Mon Sep 17 00:00:00 2001 From: "Vaibhav (OpenERP)" Date: Tue, 10 Jan 2012 18:43:48 +0530 Subject: [PATCH 3/3] [FIX] translate literal string only. bzr revid: vda@tinyerp.com-20120110131348-5mp10bkk3uwypbo3 --- addons/web/static/src/js/view_editor.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index db0d67c7897..7a76ec675a2 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -16,9 +16,10 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ this.init_view_editor(); }, init_view_editor: function() { - var self = this; + var self = this, + action_title = _.str.sprintf(_t("Manage Views (%s)"), this.model); var action = { - name: _.str.sprintf("Manage Views (%s)", this.model), + name: action_title, context: this.session.user_context, domain: [["model", "=", this.model]], res_model: 'ir.ui.view', @@ -39,7 +40,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ } }; this.view_edit_dialog = new openerp.web.Dialog(this, { - title: _t(_.str.sprintf("Manage Views (%s)", this.model)), + title: action_title, width: 850, buttons: [ {text: _t("Create"), click: function() { self.on_create_view(); }},