summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsubstantialnoninfringinguser <substantialnoninfringinguser@gmail.com>2009-06-11 06:37:07 +0100
committersubstantialnoninfringinguser <substantialnoninfringinguser@gmail.com>2009-06-11 06:37:07 +0100
commit0ed153f2d0fd38dfe94a686621a0e70922233920 (patch)
treefd3d82a11f7ffeff44fe9e2a0695f5d7d40fda66
parenta1971722242b23dbe848fb5fc271a5e419881df6 (diff)
downloadtroggle-0ed153f2d0fd38dfe94a686621a0e70922233920.tar.gz
troggle-0ed153f2d0fd38dfe94a686621a0e70922233920.tar.bz2
troggle-0ed153f2d0fd38dfe94a686621a0e70922233920.zip
[svn] Just realized it makes no sense to have qms ticked off by a logbook entry as an inline. Instead, we need some kind of drop down list where ticked off qms can be searched for and selected. Should be doable.
-rw-r--r--expo/admin.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/expo/admin.py b/expo/admin.py
index 1ef2fbf..e4863b1 100644
--- a/expo/admin.py
+++ b/expo/admin.py
@@ -33,10 +33,6 @@ class QMsFoundInline(admin.TabularInline):
model=QM
fk_name='found_by'
-class QMsTickedOffInline(admin.TabularInline):
- model=QM
- fk_name='ticked_off_by'
-
class PhotoInline(admin.TabularInline):
model = Photo
exclude = ['is_mugshot' ]
@@ -52,7 +48,7 @@ class LogbookEntryAdmin(TroggleModelAdmin):
prepopulated_fields = {'slug':("title",)}
search_fields = ('title','expedition__year')
date_heirarchy = ('date')
- inlines = (PersonTripInline, PhotoInline, QMsFoundInline, QMsTickedOffInline)
+ inlines = (PersonTripInline, PhotoInline, QMsFoundInline)
form = LogbookEntryForm
class PersonExpeditionInline(admin.TabularInline):
@@ -64,7 +60,7 @@ class PersonAdmin(TroggleModelAdmin):
inlines = (PersonExpeditionInline,)
class QMAdmin(TroggleModelAdmin):
- search_fields = ('found_by__cave__kataster_number','number','found_by__date__year')
+ search_fields = ('found_by__cave__kataster_number','number','found_by__date')
list_display = ('__unicode__','grade','found_by','ticked_off_by')
list_display_links = ('__unicode__',)
list_editable = ('found_by','ticked_off_by','grade')