[svn] Weeks of local changes.

- Import is now non-destructive
- Parsers write output to a log file (path be specified in settings)
- databaseReset.py content been divided into separate functions which can be called for varying levels of deletion and importing
- control panel (view, template, urlpattern) added for deleting and importing
- Logins and signup fixed
- CaveArea model updated, view, hierarchical url patterns, and beginning of template added
- New site style
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8324 by cucc @ 5/3/2009 5:56 AM

1 files changed, 14 insertions, 10 deletions

diff --git a/expo/admin.py b/expo/admin.py
index 7e773f6..4416dda 100644
--- a/expo/admin.py
+++ b/expo/admin.py
@@ -5,18 +5,24 @@ import django.forms as forms
 from expo.forms import LogbookEntryForm

 #from troggle.reversion.admin import VersionAdmin #django-reversion version control

 

+#overriding admin save so we have the new since parsing field

+class TroggleModelAdmin(admin.ModelAdmin):

+    def save_model(self, request, obj, form, change):

+	obj.new_since_parsing=True

+	obj.save()

+

 class RoleInline(admin.TabularInline):

     model = PersonRole

     extra = 4

 

-class SurvexBlockAdmin(admin.ModelAdmin):

+class SurvexBlockAdmin(TroggleModelAdmin):

     inlines = (RoleInline,)

 

 class ScannedImageInline(admin.TabularInline):

     model = ScannedImage

     extra = 4

 

-class SurveyAdmin(admin.ModelAdmin):

+class SurveyAdmin(TroggleModelAdmin):

     inlines = (ScannedImageInline,)

 

 class QMInline(admin.TabularInline):

@@ -34,7 +40,7 @@ class PersonTripInline(admin.TabularInline):
     extra = 1

 

 #class LogbookEntryAdmin(VersionAdmin):

-class LogbookEntryAdmin(admin.ModelAdmin):

+class LogbookEntryAdmin(TroggleModelAdmin):

     prepopulated_fields = {'slug':("title",)}

     search_fields = ('title','expedition__year')

     inlines = (PersonTripInline, PhotoInline)

@@ -47,20 +53,17 @@ class PersonExpeditionInline(admin.TabularInline):
     

 

 

-class PersonAdmin(admin.ModelAdmin):

+class PersonAdmin(TroggleModelAdmin):

     search_fields = ('first_name','last_name')

     inlines = (PersonExpeditionInline,)

 

-class QMAdmin(admin.ModelAdmin):

+class QMAdmin(TroggleModelAdmin):

     search_fields = ('found_by__cave__kataster_number','number')

-    def save_model(self, request, obj, form, change):

-	obj.new_since_parsing=True

-	obj.save()

 

-class PersonExpeditionAdmin(admin.ModelAdmin):

+class PersonExpeditionAdmin(TroggleModelAdmin):

     search_fields = ('person__first_name','expedition__year')

 

-class CaveAdmin(admin.ModelAdmin):

+class CaveAdmin(TroggleModelAdmin):

     search_fields = ('official_name','kataster_number','unofficial_number')

     #inlines = (QMInline,)

     extra = 4

@@ -68,6 +71,7 @@ class CaveAdmin(admin.ModelAdmin):
 

 

 admin.site.register(Photo)

+admin.site.register(Subcave)

 admin.site.register(Cave, CaveAdmin)

 admin.site.register(Area)

 admin.site.register(OtherCaveName)