Simplify the show_content_type_selection_widget template tag a bit

matthiask · matthiask · commit 1ff39c2c0091 · 2015-09-08T15:51:39.000+02:00
diff --git a/feincms/admin/item_editor.py b/feincms/admin/item_editor.py
@@ -134,6 +134,7 @@ def get_extra_context(self, request):
         """ Return extra context parameters for add/change views. """
 
         extra_context = {
+            'request': request,
             'model': self.model,
             'available_templates': getattr(
                 self.model, '_feincms_templates', ()),
diff --git a/feincms/templates/admin/feincms/content_type_selection_widget.html b/feincms/templates/admin/feincms/content_type_selection_widget.html
@@ -1,10 +1,11 @@
 {% load i18n %}
 <select name="order-machine-add-select">
   <option selected value>{% trans 'Insert new content:' %}</option>
-    {% for v,n in ungrouped %}<option value="{{ v }}">{{ n|capfirst }}</option> {% endfor %}
-    {% for label,cts in grouped.items %}
-        <optgroup label="{{ label }}">
-        {% for v,n in cts %}<option value="{{ v }}">{{ n|capfirst }}</option> {% endfor %}
-        </optgroup>
-    {% endfor %}
+  {% for group, cts in types.items %}
+    {% if group %}<optgroup label="{{ group }}">{% endif %}
+      {% for v, n in cts %}
+        <option value="{{ v }}">{{ n|capfirst }}</option>
+      {% endfor %}
+    {% if group %}</optgroup>{% endif %}
+  {% endfor %}
 </select>
diff --git a/feincms/templatetags/feincms_admin_tags.py b/feincms/templatetags/feincms_admin_tags.py
@@ -1,5 +1,7 @@
 from __future__ import absolute_import, unicode_literals
 
+from collections import OrderedDict
+
 from django import template
 from django.contrib.auth import get_permission_codename
 
@@ -62,31 +64,20 @@ def show_content_type_selection_widget(context, region):
     """
     {% show_content_type_selection_widget region %}
     """
-    if 'request' in context:
-        user = context['request'].user
-    elif 'user' in context:
-        user = context['user']
-    else:
-        user = None
-
-    grouped = {}
-    ungrouped = []
-
-    if user:
-        for ct in region._content_types:
-            # Skip cts that we shouldn't be adding anyway
-            opts = ct._meta
-            perm = opts.app_label + "." + get_permission_codename('add', opts)
-            if not user.has_perm(perm):
-                continue
-
-            ct_info = (ct.__name__.lower(), ct._meta.verbose_name)
-            if hasattr(ct, 'optgroup'):
-                if ct.optgroup in grouped:
-                    grouped[ct.optgroup].append(ct_info)
-                else:
-                    grouped[ct.optgroup] = [ct_info]
-            else:
-                ungrouped.append(ct_info)
-
-    return {'grouped': grouped, 'ungrouped': ungrouped}
+    user = context['request'].user
+    types = OrderedDict((None, []))
+
+    for ct in region._content_types:
+        # Skip cts that we shouldn't be adding anyway
+        opts = ct._meta
+        perm = opts.app_label + "." + get_permission_codename('add', opts)
+        if not user.has_perm(perm):
+            continue
+
+        ct_info = (ct.__name__.lower(), ct._meta.verbose_name)
+        types.setdefault(
+            getattr(ct, 'optgroup', None),
+            [],
+        ).append((ct.__name__.lower, ct._meta.verbose_name))
+
+    return {'types': types}
