[svn] Remove old subcave model, along with mptt and feincms. Also move OtherCaveNames admin representation to an inline in Cave.

core/admin.py

@@ -1,6 +1,5 @@
 from troggle.core.models import *
 from django.contrib import admin
-from feincms.admin import editor
 from django.forms import ModelForm
 import django.forms as forms
 from core.forms import LogbookEntryForm
@@ -31,6 +30,10 @@ class ScannedImageInline(admin.TabularInline):
     model = ScannedImage
     extra = 4
 
+class OtherCaveInline(admin.TabularInline):
+    model = OtherCaveName
+    extra = 1
+
 class SurveyAdmin(TroggleModelAdmin):
     inlines = (ScannedImageInline,)
     search_fields = ('expedition__year','wallet_number')    
@@ -90,17 +93,13 @@ class PersonExpeditionAdmin(TroggleModelAdmin):
 
 class CaveAdmin(TroggleModelAdmin):
     search_fields = ('official_name','kataster_number','unofficial_number')
-    #inlines = (QMInline,)
+    inlines = (OtherCaveInline,)
     extra = 4
 
-class SubcaveAdmin(editor.TreeEditorMixin,TroggleModelAdmin):
-    pass
-
 admin.site.register(Photo)
-admin.site.register(Subcave, SubcaveAdmin)
 admin.site.register(Cave, CaveAdmin)
 admin.site.register(Area)
-admin.site.register(OtherCaveName)
+#admin.site.register(OtherCaveName)
 admin.site.register(CaveAndEntrance)
 admin.site.register(SurveyStation)
 admin.site.register(NewSubCave)
@@ -131,9 +130,4 @@ def export_as_xml(modeladmin, request, queryset):
     return response
 
 admin.site.add_action(export_as_xml)
-admin.site.add_action(export_as_json)
-
-try:
-    mptt.register(Subcave, order_insertion_by=['name'])
-except mptt.AlreadyRegistered:
-    print "mptt already registered"
+admin.site.add_action(export_as_json)