Mercurial Mercurial > pub > hg > cubicweb / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge 3.19 heads
authorJulien Cristau <julien.cristau@logilab.fr>
Wed, 03 Feb 2016 15:12:32 +0100
changeset 11098 7eb9e3e254bc
parent 11059 42a4d52dc88d (diff)
parent 11066 dcbb64d3a1d9 (current diff)
child 11114 468b91aabd9d
merge 3.19 heads Getting an unexpected test error though: ERROR: test_edit_mandatory_inlined3_object (unittest_views_basecontrollers.EditControllerTC)
--- a/.hgtags	Tue Jan 26 14:04:45 2016 +0100
+++ b/.hgtags	Wed Feb 03 15:12:32 2016 +0100
@@ -408,3 +408,6 @@
 5932de3d50bf023544c8f54b47898e4db35eac7c 3.19.12
 5932de3d50bf023544c8f54b47898e4db35eac7c debian/3.19.12-1
 5932de3d50bf023544c8f54b47898e4db35eac7c centos/3.19.12-1
+f933a38d7ab5fc6f2ad593fe1cf9985ce9d7e873 3.19.13
+f933a38d7ab5fc6f2ad593fe1cf9985ce9d7e873 debian/3.19.13-1
+f933a38d7ab5fc6f2ad593fe1cf9985ce9d7e873 centos/3.19.13-1
--- a/web/views/debug.py	Tue Jan 26 14:04:45 2016 +0100
+++ b/web/views/debug.py	Wed Feb 03 15:12:32 2016 +0100
@@ -126,8 +126,8 @@
         w(u'<tr><th align="left">%s</th><td>%s</td></tr>' % (
             _('data directory url'), req.datadir_url))
         w(u'</table>')
-        if req.user.is_in_group('managers'):
-            from cubicweb.web.application import SESSION_MANAGER
+        from cubicweb.web.application import SESSION_MANAGER
+        if SESSION_MANAGER is not None and req.user.is_in_group('managers'):
             sessions = SESSION_MANAGER.current_sessions()
             w(u'<h3>%s</h3>' % _('opened web sessions'))
             if sessions:
cubicweb