From: hernani <hernani@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Date: Tue, 14 Jun 2011 22:56:01 +0000 (+0000)
Subject: Should fix the missing admin items problem.
X-Git-Tag: live~246
X-Git-Url: https://git.openstreetmap.org./osqa.git/commitdiff_plain/f32668123bbf48a0b73e90024bc09aa60e903ea0

Should fix the missing admin items problem.

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1067 0cfe37f9-358a-4d5e-be75-b63607b5c754
---

diff --git a/forum/skins/default/templates/osqaadmin/base.html b/forum/skins/default/templates/osqaadmin/base.html
index ac78524..6546944 100644
--- a/forum/skins/default/templates/osqaadmin/base.html
+++ b/forum/skins/default/templates/osqaadmin/base.html
@@ -39,8 +39,8 @@
         
         <li><a href="{% url admin_maintenance %}">{% trans "Maintenance mode" %}</a></li>
         <li><a href="{% url admin_flagged_posts %}">{% trans "Flagged Posts" %}</a></li>
-        {% for name,tool in tools.items %}
-            <li><a href="{% url admin_tools name %}">{{ tool.label }}</a></li>
+        {% for name,tool in tools %}
+            <li><a href="{% url admin_tools name %}">{{ tool }}</a></li>
         {% endfor %}
         </ul>
     </div>
diff --git a/forum/skins/default/templates/osqaadmin/djstyle_base.html b/forum/skins/default/templates/osqaadmin/djstyle_base.html
index 3527dc1..25c4be0 100644
--- a/forum/skins/default/templates/osqaadmin/djstyle_base.html
+++ b/forum/skins/default/templates/osqaadmin/djstyle_base.html
@@ -129,8 +129,8 @@
                     <ul>
                         <li><a href="{% url admin_maintenance %}">{% trans "Maintenance mode" %}</a></li>
                         <li><a href="{% url admin_flagged_posts %}">{% trans "Flagged Posts" %}</a></li>
-                        {% for name,tool in tools.items %}
-                            <li><a href="{% url admin_tools name %}">{{ tool.label }}</a></li>
+                        {% for name,tool in tools %}
+                            <li><a href="{% url admin_tools name %}">{{ tool }}</a></li>
                         {% endfor %}
                     </ul>
                 </div>
diff --git a/forum/views/admin.py b/forum/views/admin.py
index e9e9d47..724315f 100644
--- a/forum/views/admin.py
+++ b/forum/views/admin.py
@@ -54,7 +54,7 @@ def admin_page_wrapper(fn, request, *args, **kwargs):
             'form', 'moderation', 'css', 'headandfoot', 'head', 'view', 'urls')]
             , lambda s1, s2: s1.weight - s2.weight)
 
-    context['tools'] = TOOLS
+    context['tools'] = [(name, fn.label) for name, fn in TOOLS.items()]
 
     unsaved = request.session.get('previewing_settings', {})
     context['unsaved'] = set([getattr(settings, s).set.name for s in unsaved.keys() if hasattr(settings, s)])