# HG changeset patch # User Laure Bourgois # Date 1233159922 -3600 # Node ID f4a6f1ccc4d887413e78c28cfc211ae1f5265d2a # Parent 04f40057fc4de0f3c7e070a9815fff7c7ca0d2d9# Parent f60de0a5ef95ff31d692f2fc97b1d6dca779e920 merge diff -r f60de0a5ef95 -r f4a6f1ccc4d8 web/views/startup.py --- a/web/views/startup.py Wed Jan 28 17:22:45 2009 +0100 +++ b/web/views/startup.py Wed Jan 28 17:25:22 2009 +0100 @@ -10,7 +10,7 @@ from logilab.mtconverter import html_escape from cubicweb.common.uilib import ureport_as_html, unormalize, ajax_replace_url -from cubicweb.common.view import StartupView +from cubicweb.common.view import StartupView, EntityView from cubicweb.web.httpcache import EtagHTTPCacheManager _ = unicode diff -r f60de0a5ef95 -r f4a6f1ccc4d8 web/views/tabs.py --- a/web/views/tabs.py Wed Jan 28 17:22:45 2009 +0100 +++ b/web/views/tabs.py Wed Jan 28 17:25:22 2009 +0100 @@ -55,10 +55,11 @@ def active_tab(self, tabs, default): cookie = self.req.get_cookie() - activetab = cookie.get('active_tab') + cookiename = '%s_active_tab' % self.config.appid + activetab = cookie.get(cookiename) if activetab is None: - cookie['active_tab'] = default - self.req.set_cookie(cookie, 'active_tab') + cookie[cookiename] = default + self.req.set_cookie(cookie, cookiename) tab = default else: tab = activetab.value @@ -112,8 +113,9 @@ def js_remember_active_tab(self, tabname): cookie = self.req.get_cookie() - cookie['active_tab'] = tabname - self.req.set_cookie(cookie, 'active_tab') + cookiename = '%s_active_tab' % self.config.appid + cookie[cookiename] = tabname + self.req.set_cookie(cookie, cookiename) def js_lazily(self, vid_eid): vid, eid = vid_eid.split('-')