From bf2423b574d37372a2b902665bfc12f6ba9af6c9 Mon Sep 17 00:00:00 2001
From: Yakovlev Alexander <ayakovlev@rambler.ru>
Date: Wed, 16 Apr 2014 08:53:39 +0400
Subject: [PATCH] Django 1.6 admin compatibility fix. Refs #37.

---
 authority/admin.py                                    | 2 --
 authority/templates/admin/permission_change_form.html | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/authority/admin.py b/authority/admin.py
index 158c9a1..c55b481 100644
--- a/authority/admin.py
+++ b/authority/admin.py
@@ -81,7 +81,6 @@ def edit_permissions(modeladmin, request, queryset):
         inline_admin_formsets.append(inline_admin_formset)
         media = media + inline_admin_formset.media
 
-    ordered_objects = opts.get_ordered_objects()
     if request.POST.get('post'):
         if all_valid(formsets):
             for formset in formsets:
@@ -99,7 +98,6 @@ def edit_permissions(modeladmin, request, queryset):
         'inline_admin_formsets': inline_admin_formsets,
         'app_label': app_label,
         'change': True,
-        'ordered_objects': ordered_objects,
         'form_url': mark_safe(''),
         'opts': opts,
         'target_opts': queryset.model._meta,
diff --git a/authority/templates/admin/permission_change_form.html b/authority/templates/admin/permission_change_form.html
index 54e4e2f..2202f79 100644
--- a/authority/templates/admin/permission_change_form.html
+++ b/authority/templates/admin/permission_change_form.html
@@ -8,7 +8,7 @@
 
 {% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}"/>{% endblock %}
 
-{% block coltype %}{% if ordered_objects %}colMS{% else %}colM{% endif %}{% endblock %}
+{% block coltype %}colM{% endblock %}
 
 {% block bodyclass %}{{ opts.app_label }}-{{ opts.object_name.lower }} change-form{% endblock %}