Fix #184 the correct way

matthiask · matthiask · commit 453db9fb317d · 2011-06-21T15:03:12.000+02:00
diff --git a/feincms/content/application/models.py b/feincms/content/application/models.py
@@ -69,11 +69,6 @@ def reverse(viewname, urlconf=None, args=None, kwargs=None, prefix=None, *vargs,
         # TODO do not use internal feincms data structures as much
         model_class = ApplicationContent._feincms_content_models[0]
 
-        if other_urlconf in model_class.ALL_APPS_CONFIG:
-            # We have an overridden URLconf
-            other_urlconf = model_class.ALL_APPS_CONFIG[other_urlconf]['config'].get('urls',
-                other_urlconf)
-
         if hasattr(_local, 'urlconf') and other_urlconf == _local.urlconf[0]:
             # We are reversing an URL from our own ApplicationContent
             return _reverse(other_viewname, other_urlconf, args, kwargs, _local.urlconf[1], *vargs, **vkwargs)
@@ -145,6 +140,11 @@ def reverse(viewname, urlconf=None, args=None, kwargs=None, prefix=None, *vargs,
             # application contents' ``process`` method currently
             saved_cfg = getattr(_local, 'urlconf', None)
 
+            if other_urlconf in model_class.ALL_APPS_CONFIG:
+                # We have an overridden URLconf
+                other_urlconf = model_class.ALL_APPS_CONFIG[other_urlconf]['config'].get(
+                    'urls', other_urlconf)
+
             # Initialize application content reverse hackery for the other application
             _local.urlconf = (other_urlconf, content.parent.get_absolute_url())
 
diff --git a/feincms/tests/base.py b/feincms/tests/base.py
@@ -1082,33 +1082,17 @@ def test_25_applicationcontent(self):
         self.assertContains(response, 'args:/test-page/test-child-page/args_test/xy/zzy/')
         self.assertContains(response, 'base:/test/')
 
-        response = self.client.get(page.get_absolute_url() + 'alias_reverse_test/')
-        self.assertContains(response, 'home:/test-page/test-child-page/')
-        self.assertContains(response, 'args:/test-page/test-child-page/args_test/xy/zzy/')
-        self.assertContains(response, 'base:/test/')
-
         self.assertEqual(reverse('feincms.tests.applicationcontent_urls/ac_module_root'),
             '/test-page/test-child-page/')
-        self.assertEqual(reverse('whatever/ac_module_root'),
-            '/test-page/test-child-page/')
 
         if hasattr(self, 'assertNumQueries'):
             self.assertNumQueries(0,
                 lambda: reverse('feincms.tests.applicationcontent_urls/ac_module_root'))
-            self.assertNumQueries(0,
-                lambda: reverse('whatever/ac_module_root'))
 
             _empty_reverse_cache()
 
             self.assertNumQueries(1,
                 lambda: reverse('feincms.tests.applicationcontent_urls/ac_module_root'))
-            self.assertNumQueries(0,
-                lambda: reverse('whatever/ac_module_root'))
-
-            _empty_reverse_cache()
-
-            self.assertNumQueries(1,
-                lambda: reverse('whatever/ac_module_root'))
             self.assertNumQueries(0,
                 lambda: reverse('feincms.tests.applicationcontent_urls/ac_module_root'))
 
@@ -1144,10 +1128,20 @@ def test_25_applicationcontent(self):
             ordering=0,
             urlconf_path='whatever')
 
+        response = self.client.get(page.get_absolute_url() + 'alias_reverse_test/')
+        self.assertContains(response, 'home:/test-page/')
+        self.assertContains(response, 'args:/test-page/args_test/xy/zzy/')
+        self.assertContains(response, 'base:/test/')
+
         self.assertEqual(reverse('blog_urls/blog_entry_list'), '/test-page/test-child-page/')
         self.assertEqual(reverse('feincms.tests.applicationcontent_urls/ac_module_root'),
             '/test-page/test-child-page/')
-        self.assertEqual(reverse('whatever/ac_module_root'), '/test-page/test-child-page/')
+        self.assertEqual(reverse('whatever/ac_module_root'), '/test-page/')
+
+        page.applicationcontent_set.get(urlconf_path='feincms.tests.applicationcontent_urls').delete()
+
+        self.assertEqual(reverse('blog_urls/blog_entry_list'), '/test-page/test-child-page/')
+        self.assertEqual(reverse('whatever/ac_module_root'), '/test-page/')
 
     def test_26_page_form_initial(self):
         self.create_default_page_set()
