Untied admin hierarchy and urlpatterns

misago/admin/__init__.py

@@ -1 +1,2 @@
-from misago.admin.hierarchy import site, urlpatterns  # noqa
+from misago.admin.hierarchy import site  # noqa
+from misago.admin.urlpatterns import urlpatterns  # noqa

misago/admin/hierarchy.py

@@ -1,5 +1,4 @@
 from django.core.urlresolvers import reverse
-from misago.admin.urlpatterns import URLPatterns
 
 
 class Node(object):
@@ -94,7 +93,6 @@ class AdminHierarchyBuilder(object):
     def __init__(self):
         self.nodes_record = []
         self.nodes_dict = {}
-        self.urlpatterns = URLPatterns()
 
     def build_nodes_dict(self):
         nodes_dict = {'misago:admin': Node(link='misago:admin:index')}
@@ -190,4 +188,3 @@ class AdminHierarchyBuilder(object):
 
 
 site = AdminHierarchyBuilder()
-urlpatterns = site.urlpatterns

misago/admin/urlpatterns.py

@@ -70,3 +70,6 @@ class URLPatterns(object):
             self._namespaces = []
             self._patterns = []
             return self._urlpatterns
+
+
+urlpatterns = URLPatterns()

misago/admin/urls.py

@@ -2,7 +2,7 @@ import importlib
 from django.conf import settings
 from django.conf.urls import patterns, include, url
 from django.core.exceptions import ImproperlyConfigured
-from misago.admin import site
+from misago.admin import urlpatterns as admin_urlpatterns
 
 
 urlpatterns = patterns('misago.admin.views',
@@ -32,4 +32,4 @@ def initialize_admin_urls():
 
 # Register discovered patterns
 initialize_admin_urls()
-urlpatterns += site.urlpatterns()
+urlpatterns += admin_urlpatterns()