From 88eacfdf796f9171711ee5cf24f072c6a2af7aa2 Mon Sep 17 00:00:00 2001 From: Karla Stenger Date: Sat, 29 Jul 2017 19:53:08 -0300 Subject: [PATCH] Add login details in title issue6598 review37551002 --- CHANGELOG | 2 ++ src/sao.js | 29 +++++++++++++++++++++++------ 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index d03a883f5b..54058eac51 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,5 @@ +* Use login details in title + Version 4.4.0 - 2017-05-01 * Bug fixes (see mercurial logs for details) * Manage help attribute on tree views diff --git a/src/sao.js b/src/sao.js index c0cfacfec8..b85082d8cb 100644 --- a/src/sao.js +++ b/src/sao.js @@ -236,11 +236,7 @@ var Sao = {}; (preferences.actions || []).forEach(function(action_id) { Sao.Action.execute(action_id, {}, null, {}); }); - var title = Sao.config.title; - if (!jQuery.isEmptyObject(preferences.status_bar)) { - title += ' - ' + preferences.status_bar; - } - document.title = title; + Sao.set_title(preferences.status_bar); var new_lang = preferences.language != Sao.i18n.getLocale(); var prm = jQuery.Deferred(); Sao.i18n.setlang(preferences.language).always(function() { @@ -255,6 +251,27 @@ var Sao = {}; }); }; + Sao.set_title = function(value) { + var title = [Sao.config.title]; + var session = Sao.Session.current_session; + var login_info = ''; + if (session) { + if (session.login) { + login_info = session.login + '@' + document.location.host; + } + if (session.database) { + login_info += '/' + session.database; + } + title = title.concat(login_info); + } else { + title = title.concat(document.location.host); + } + if (value) { + title = title.concat(value); + } + document.title = title.join(' - '); + }; + Sao.login = function() { Sao.Session.get_credentials() .then(function(session) { @@ -273,8 +290,8 @@ var Sao = {}; jQuery('#user-logout').children().remove(); jQuery('#user-favorites').children().remove(); jQuery('#menu').children().remove(); - document.title = Sao.config.title; session.do_logout().always(Sao.login); + Sao.set_title(); }); };