From 8ad044cb2c2cbf728cb5aacd665e2c1f7337c709 Mon Sep 17 00:00:00 2001 From: substantialnoninfringinguser Date: Mon, 6 Jul 2009 08:31:24 +0100 Subject: [svn] * Make Q< wikilinks work again * Add new ajax bit in LogbookEntry admin which checks for QMs not in wikilink format and allows one click fixes. Soon to be expanded to check for wikilinks that aren't in foreignkey. * Tweaks to admin including using raw_id_fields for PersonExpedition & other foreignkeyed models with lots of instances. --- core/admin.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'core/admin.py') diff --git a/core/admin.py b/core/admin.py index 1a46d04..438281e 100644 --- a/core/admin.py +++ b/core/admin.py @@ -2,7 +2,6 @@ from troggle.core.models import * from django.contrib import admin from django.forms import ModelForm import django.forms as forms -from core.forms import LogbookEntryForm from django.http import HttpResponse from django.core import serializers from core.views_other import downloadLogbook @@ -42,6 +41,7 @@ class QMsFoundInline(admin.TabularInline): model=QM fk_name='found_by' fields=('number','grade','location_description','comment')#need to add foreignkey to cave part + extra=1 class PhotoInline(admin.TabularInline): model = Photo @@ -51,6 +51,7 @@ class PhotoInline(admin.TabularInline): class PersonTripInline(admin.TabularInline): model = PersonTrip exclude = ['persontrip_next','Delete'] + raw_id_fields = ('person_expedition',) extra = 1 #class LogbookEntryAdmin(VersionAdmin): @@ -59,8 +60,10 @@ class LogbookEntryAdmin(TroggleModelAdmin): search_fields = ('title','expedition__year') date_heirarchy = ('date') inlines = (PersonTripInline, PhotoInline, QMsFoundInline) - form = LogbookEntryForm - + class Media: + css = { + "all": ("css/troggleadmin.css",) + } actions=('export_logbook_entries_as_html','export_logbook_entries_as_txt') def export_logbook_entries_as_html(modeladmin, request, queryset): @@ -87,6 +90,7 @@ class QMAdmin(TroggleModelAdmin): list_display_links = ('__unicode__',) list_editable = ('found_by','ticked_off_by','grade') list_per_page = 20 + raw_id_fields=('found_by','ticked_off_by') class PersonExpeditionAdmin(TroggleModelAdmin): search_fields = ('person__first_name','expedition__year') -- cgit v1.2.3