From 5e0ea8e3752dae6362b8cc0f46085c3c3b752bba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Fri, 4 Mar 2016 11:33:13 +0100
Subject: [PATCH] backoffice: make it possible to have the global view as
 default (#10139)

---
 tests/test_backoffice_pages.py | 16 +++++++++-------
 wcs/backoffice/management.py   | 11 ++++++++---
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/tests/test_backoffice_pages.py b/tests/test_backoffice_pages.py
index 8d7e30f..1eedcbe 100644
--- a/tests/test_backoffice_pages.py
+++ b/tests/test_backoffice_pages.py
@@ -192,6 +192,7 @@ def test_backoffice_forms(pub):
     app = login(get_app(pub))
     resp = app.get('/backoffice/')
     resp = resp.click('Management', index=0)
+    resp = resp.follow()
     assert not 'Forms in your care' in resp.body
     assert re.findall('Other Forms.*form-title', resp.body)
 
@@ -200,6 +201,7 @@ def test_backoffice_forms(pub):
     app = login(get_app(pub))
     resp = app.get('/backoffice/')
     resp = resp.click('Management', index=0)
+    resp = resp.follow()
     assert 'Forms in your care' in resp.body
     assert '17 open on 50' in resp.body
 
@@ -644,7 +646,7 @@ def test_backoffice_handling_post_dispatch(pub):
     app = login(get_app(pub))
 
     # check there's no access at the moment
-    resp = app.get('/backoffice/management/')
+    resp = app.get('/backoffice/management/').follow()
     assert not 'form-title/' in resp.body
     resp = app.get('/backoffice/management/form-title/', status=403)
     resp = app.get('/backoffice/management/form-title/%s/' % number31.id, status=403)
@@ -656,7 +658,7 @@ def test_backoffice_handling_post_dispatch(pub):
     formdata31.store()
 
     # check listing is accessible, with a single item
-    resp = app.get('/backoffice/management/')
+    resp = app.get('/backoffice/management/').follow()
     assert 'form-title/' in resp.body
     resp = app.get('/backoffice/management/form-title/', status=200)
     assert re.findall('<tbody.*\/tbody>', resp.body, re.DOTALL)[0].count('<tr') == 1
@@ -1313,7 +1315,7 @@ def test_global_listing(pub):
     create_user(pub)
     create_environment(pub)
     app = login(get_app(pub))
-    resp = app.get('/backoffice/management/')
+    resp = app.get('/backoffice/management/').follow()
     assert 'Global View' in resp.body
     resp = resp.click('Global View')
     assert resp.body.count('<tr') == 20
@@ -1364,7 +1366,7 @@ def test_tracking_code_access(pub):
     code.formdata = formdata
 
     app = login(get_app(pub))
-    resp = app.get('/backoffice/management/')
+    resp = app.get('/backoffice/management/').follow()
     assert 'id="tracking-code"' in resp.body
     resp.forms[0]['code'] = formdata.tracking_code
     resp = resp.forms[0].submit()
@@ -1376,11 +1378,11 @@ def test_tracking_code_access(pub):
     # check there's no access to other formdata
     app.get('http://example.net/backoffice/management/form-title/%s/' % formdata2.id, status=403)
 
-    resp = app.get('/backoffice/management/')
+    resp = app.get('/backoffice/management/').follow()
     resp.forms[0]['code'] = 'AAAAAAAA'
     resp = resp.forms[0].submit()
     assert resp.location == 'http://example.net/backoffice/management/'
-    resp = resp.follow()
+    resp = resp.follow().follow()
     assert 'No such code' in resp.body
 
     if pub.is_using_postgresql():
@@ -1611,7 +1613,7 @@ def test_360_user_view(pub):
     user = create_user(pub)
     create_environment(pub)
     app = login(get_app(pub))
-    resp = app.get('/backoffice/management/')
+    resp = app.get('/backoffice/management/').follow()
     assert '360 User View' in resp.body
     resp = resp.click('360 User View')
     assert 'Use the search field on the right' in resp.body
diff --git a/wcs/backoffice/management.py b/wcs/backoffice/management.py
index 3431124..058d2b2 100644
--- a/wcs/backoffice/management.py
+++ b/wcs/backoffice/management.py
@@ -384,7 +384,7 @@ class UsersViewDirectory(Directory):
 
 
 class ManagementDirectory(Directory):
-    _q_exports = ['', 'listing', 'statistics', 'code', 'count', 'users']
+    _q_exports = ['', 'forms', 'listing', 'statistics', 'code', 'count', 'users']
 
     users = UsersViewDirectory()
 
@@ -396,6 +396,12 @@ class ManagementDirectory(Directory):
         return super(ManagementDirectory, self)._q_traverse(path)
 
     def _q_index(self):
+        if get_publisher().has_site_option('default-to-global-view'):
+            return redirect('listing')
+        else:
+            return redirect('forms')
+
+    def forms(self):
         html_top('management', _('Management'))
         get_response().filter['sidebar'] = self.get_sidebar()
         r = TemplateIO(html=True)
@@ -668,7 +674,6 @@ class ManagementDirectory(Directory):
             raise errors.TraversalError()
 
         get_response().add_javascript(['jquery.js', 'jquery-ui.js', 'wcs.listing.js'])
-        get_response().breadcrumb.append(('listing', _('Global View')))
         from wcs import sql
         html_top('management', _('Management'))
 
@@ -758,7 +763,7 @@ class ManagementDirectory(Directory):
         rt += htmltext('<div class="top-title">')
         rt += htmltext('<h2>%s</h2>') % _('Global View')
         rt += htmltext('<div class="alt-views">')
-        rt += htmltext('<a href=".">%s</a>') % _('Forms View')
+        rt += htmltext('<a href="forms">%s</a>') % _('Forms View')
         rt += htmltext('</div>')
         rt += htmltext('</div>')
         rt += get_session().display_message()
-- 
2.7.0