Getting the admin interface working

jazzband · Aug 27, 2009 · 01c6cf3 · 01c6cf3
1 parent 603352c
commit 01c6cf3
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 582 deletions.
diff --git a/categories/admin.py b/categories/admin.py
@@ -3,7 +3,7 @@
 from django import forms
 from django.template.defaultfilters import slugify
 from mptt.forms import TreeNodeChoiceField
-from editor import TreeEditorMixin
+from editor.tree_editor import TreeEditor
 
 class NullTreeNodeChoiceField(forms.ModelChoiceField):
     """A ModelChoiceField for tree nodes."""
@@ -57,7 +57,7 @@ def clean(self):
         return self.cleaned_data
 
 
-class CategoryAdmin(TreeEditorMixin, admin.ModelAdmin):
+class CategoryAdmin(TreeEditor, admin.ModelAdmin):
     form=CategoryAdminForm
     list_display = ('__unicode__',)
     search_fields = (('name',))

diff --git a/categories/models.py b/categories/models.py
@@ -24,7 +24,7 @@ def get_absolute_url(self):
     class Meta:
         verbose_name_plural = 'categories'
         unique_together = ('parent', 'name')
-        ordering = ('name',)
+        ordering = ('tree_id','lft')
 
     def __unicode__(self):
         ancestors = self.get_ancestors()

diff --git a/categories/templates/admin/editor/_messages.html b/categories/templates/admin/editor/_messages.html
diff --git a/categories/templates/admin/editor/box.html b/categories/templates/admin/editor/box.html
diff --git a/categories/templates/admin/editor/editor.html b/categories/templates/admin/editor/editor.html
diff --git a/categories/templates/admin/editor/editor_done.html b/categories/templates/admin/editor/editor_done.html
diff --git a/categories/templates/admin/editor/item_editor.html b/categories/templates/admin/editor/item_editor.html