Fix the calls to the import/export urls in the main wrapper

bookieio · Jun 18, 2011 · a18a29a · a18a29a
1 parent e1fffbc
commit a18a29a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 19 deletions.
diff --git a/bookie/templates/main_wrap.mako b/bookie/templates/main_wrap.mako
@@ -62,12 +62,12 @@
             <div class="yui3-u-1-4"></div>
             <div class="yui3-u-3-4">
                 <div class="right body">
-                    <a href="http://bmark.us">Bookie</a> |
+                    <a href="http://docs.bmark.us">Bookie</a> |
                     <a href="http://github.com/mitechie/Bookie/issues">Support</a> |
                     <a href="#changelog">Changes</a> |
                     % if request.user:
-                        <a href="${request.route_url('user_import')}">Import</a> |
-                        <a href="${request.route_url('user_export')}">Export</a> |
+                        <a href="${request.route_url('user_import', username=request.user.username)}">Import</a> |
+                        <a href="${request.route_url('user_export', username=request.user.username)}">Export</a> |
                     % endif
 
                     % if request.user:

diff --git a/bookie/tests/test_utils/test_imports.py b/bookie/tests/test_utils/test_imports.py
@@ -232,14 +232,13 @@ def tearDown(self):
     def test_delicious_import(self):
         """Test that we can upload/import our test file"""
         # first let's login to the site so we can get in
-        req = self.testapp.post('/login',
-                                params={
-                                    "login": "admin",
-                                    "password": "admin",
-                                    "form.submitted": "Log In",
-                                },
-                                status=302)
-        req = req.follow()
+        self.testapp.post('/login',
+                            params={
+                                "login": "admin",
+                                "password": "admin",
+                                "form.submitted": "Log In",
+                            },
+                            status=302)
 
         session = DBSession()
         loc = os.path.dirname(__file__)
@@ -268,14 +267,13 @@ def test_delicious_import(self):
 
     def test_google_import(self):
         """Test that we can upload our google file"""
-        req = self.testapp.post('/login',
-                                params={
-                                    "login": "admin",
-                                    "password": "admin",
-                                    "form.submitted": "Log In",
-                                },
-                                status=302)
-        req = req.follow()
+        self.testapp.post('/login',
+                            params={
+                                "login": "admin",
+                                "password": "admin",
+                                "form.submitted": "Log In",
+                            },
+                            status=302)
 
         session = DBSession()
         loc = os.path.dirname(__file__)

diff --git a/bookie/views/bmarks.py b/bookie/views/bmarks.py
@@ -26,6 +26,7 @@ def recent(request):
     rdict = request.matchdict
     params = request.params
 
+    LOG.debug('in recent!')
     # check if we have a page count submitted
     page = int(params.get('page', '0'))