Christophe (OpenERP) has proposed merging
lp:~openerp-dev/openerp-web/6.1-webclient.set_title-chs into lp:openerp-web/6.1.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-web/6.1-webclient.set_title-chs/+merge/96619
--
https://code.launchpad.net/~openerp-dev/openerp-web/6.1-webclient.set_title-chs/+merge/96619
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openerp-web/6.1-webclient.set_title-chs.
=== modified file 'addons/web/static/src/js/chrome.js'
--- addons/web/static/src/js/chrome.js 2012-02-23 13:39:37 +0000
+++ addons/web/static/src/js/chrome.js 2012-03-08 16:56:59 +0000
@@ -1073,6 +1073,18 @@
this._current_state = null;
},
+ _get_version_label: function() {
+ if (this.session.openerp_entreprise) {
+ return 'OpenERP';
+ } else {
+ return _t("OpenERP - Unsupported/Community Version");
+ }
+ },
+ set_title: function(title) {
+ title = _.str.clean(title);
+ var sep = _.isEmpty(title) ? '' : ' - ';
+ document.title = title + sep + this._get_version_label();
+ },
start: function() {
var self = this;
this.$element = $(document.body);
@@ -1097,11 +1109,11 @@
self.action_manager = new openerp.web.ActionManager(self);
self.action_manager.appendTo($("#oe_app"));
self.bind_hashchange();
- var version_label = _t("OpenERP - Unsupported/Community Version");
if (!self.session.openerp_entreprise) {
+ var version_label = self._get_version_label();
self.$element.find('.oe_footer_powered').append(_.str.sprintf('<span> - <a href="http://www.openerp.com/support-or-publisher-warranty-contract"; target="_blank">%s</a></span>', version_label));
- document.title = version_label;
}
+ self.set_title();
});
},
show_login: function() {
@@ -1192,6 +1204,10 @@
this._current_state = state;
},
do_push_state: function(state) {
+ var title = state.title;
+ delete state.title;
+ this.set_title(title);
+
var url = '#' + $.param(state);
this._current_state = _.clone(state);
$.bbq.pushState(url);
=== modified file 'addons/web/static/src/js/views.js'
--- addons/web/static/src/js/views.js 2012-03-06 20:59:55 +0000
+++ addons/web/static/src/js/views.js 2012-03-08 16:56:59 +0000
@@ -49,6 +49,7 @@
do_push_state: function(state) {
if (this.widget_parent && this.widget_parent.do_push_state) {
if (this.inner_action) {
+ state['title'] = this.inner_action.name;
state['model'] = this.inner_action.res_model;
if (this.inner_action.id) {
state['action_id'] = this.inner_action.id;
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
