Browse Source

Fixed hierarchy resolution

Rafał Pitoń 11 years ago
parent
commit
b2c7054b08

+ 1 - 4
misago/admin/hierarchy.py

@@ -121,10 +121,7 @@ class AdminHierarchyBuilder(object):
                         node_added = parent.add_node(node_obj)
                         node_added = parent.add_node(node_obj)
 
 
                     if node_added:
                     if node_added:
-                        if node['namespace']:
-                            namespace = '%s:%s' % (node['parent'], node['namespace'])
-                        else:
-                            namespace = node['parent']
+                        namespace = node_obj.namespace
 
 
                         if namespace not in nodes_dict:
                         if namespace not in nodes_dict:
                             nodes_dict[namespace] = node_obj
                             nodes_dict[namespace] = node_obj

+ 3 - 0
misago/admin/views/__init__.py

@@ -6,6 +6,9 @@ from misago.admin.auth import is_admin_session, update_admin_session
 from misago.admin.views.auth import login
 from misago.admin.views.auth import login
 
 
 
 
+__ALL__ = ['get_protected_namespace', 'render', 'protected_admin_view']
+
+
 def get_protected_namespace(request):
 def get_protected_namespace(request):
     for namespace in settings.MISAGO_ADMIN_NAMESPACES:
     for namespace in settings.MISAGO_ADMIN_NAMESPACES:
         try:
         try:

+ 5 - 1
misago/conf/views.py

@@ -1,2 +1,6 @@
+from django.shortcuts import redirect
+from misago.admin.views import render
+
+
 def index(request):
 def index(request):
-    raise Exception('WSUP, ADMIN SETTINGS GROUPZ!')
+    return render(request, 'misago/admin/conf/index.html')

+ 17 - 0
misago/templates/misago/admin/conf/index.html

@@ -0,0 +1,17 @@
+{% extends "misago/admin/base.html" %}
+{% load i18n %}
+
+
+{% block title %}{% trans "Settings" %} | {{ block.super }}{% endblock %}
+
+
+{% block content %}
+<div class="page-header">
+  <div class="container">
+    <h1>
+      <span class="fa fa-cogs">
+      {% trans "Settings" %}
+    </h1>
+  </div>
+</div>
+{% endblock content %}