diff options
Diffstat (limited to 'archaeological_context_records')
| -rw-r--r-- | archaeological_context_records/admin.py | 22 | ||||
| -rw-r--r-- | archaeological_context_records/lookups.py | 22 | ||||
| -rw-r--r-- | archaeological_context_records/migrations/0101_squashed.py | 2 |
3 files changed, 6 insertions, 40 deletions
diff --git a/archaeological_context_records/admin.py b/archaeological_context_records/admin.py index 0c21484e5..7d6d85e08 100644 --- a/archaeological_context_records/admin.py +++ b/archaeological_context_records/admin.py @@ -17,9 +17,6 @@ # See the file COPYING for details. -from ajax_select import make_ajax_form -from ajax_select.fields import AutoCompleteSelectField - from django import forms from django.contrib import admin from django.contrib.gis.forms import PointField, MultiPolygonField, OSMWidget @@ -55,22 +52,19 @@ class AdminContextRecordForm(forms.ModelForm): multi_polygon = MultiPolygonField( label=_("Multi polygon"), required=False, widget=OSMWidget ) - operation = AutoCompleteSelectField("operation") - parcel = AutoCompleteSelectField("parcel", required=False) - town = AutoCompleteSelectField("town", required=False) - archaeological_site = AutoCompleteSelectField("archaeological_site", required=False) - lock_user = AutoCompleteSelectField("user", required=False) class ContextRecordAdmin(HistorizedObjectAdmin): list_display = ("label", "operation", "parcel") list_filter = ("unit",) search_fields = ( - "label", - "parcel__operation__cached_label", + "cached_label", + "town", "parcel__section", "parcel__parcel_number", ) + autocomplete_fields = ["operation", "parcel", "town", "archaeological_site", + "lock_user"] model = models.ContextRecord form = AdminContextRecordForm readonly_fields = HistorizedObjectAdmin.readonly_fields + [ @@ -87,13 +81,7 @@ class RecordRelationsAdmin(admin.ModelAdmin): list_display = ("left_record", "relation_type", "right_record") list_filter = ("relation_type",) model = models.RecordRelations - form = make_ajax_form( - model, - { - "left_record": "context_record", - "right_record": "context_record", - }, - ) + autocomplete_fields = ["left_record", "right_record"] admin_site.register(models.RecordRelations, RecordRelationsAdmin) diff --git a/archaeological_context_records/lookups.py b/archaeological_context_records/lookups.py deleted file mode 100644 index 3131127d8..000000000 --- a/archaeological_context_records/lookups.py +++ /dev/null @@ -1,22 +0,0 @@ -from ajax_select import register - -from ishtar_common.lookups import LookupChannel - -from django.db.models import Q - -from archaeological_context_records import models - - -@register("context_record") -class ContextRecordLookup(LookupChannel): - model = models.ContextRecord - - def get_query(self, q, request): - query = Q() - for term in q.strip().split(" "): - subquery = Q(cached_label__icontains=term) | Q(town__name__icontains=term) - query &= subquery - return self.model.objects.filter(query).order_by("cached_label")[:20] - - def format_item_display(self, item): - return "<span class='ajax-label'>%s</span>" % item.cached_label diff --git a/archaeological_context_records/migrations/0101_squashed.py b/archaeological_context_records/migrations/0101_squashed.py index d8b56641a..c61955270 100644 --- a/archaeological_context_records/migrations/0101_squashed.py +++ b/archaeological_context_records/migrations/0101_squashed.py @@ -111,7 +111,7 @@ class Migration(migrations.Migration): 'verbose_name': 'Context Record', 'verbose_name_plural': 'Context Record', 'ordering': ('cached_label',), - 'permissions': (('view_contextrecord', 'Can view all Context Records'), ('view_own_contextrecord', 'Can view own Context Record'), ('add_own_contextrecord', 'Can add own Context Record'), ('change_own_contextrecord', 'Can change own Context Record'), ('delete_own_contextrecord', 'Can delete own Context Record')), + 'permissions': (('view_own_contextrecord', 'Can view own Context Record'), ('add_own_contextrecord', 'Can add own Context Record'), ('change_own_contextrecord', 'Can change own Context Record'), ('delete_own_contextrecord', 'Can delete own Context Record')), }, bases=(ishtar_common.models.BulkUpdatedItem, ishtar_common.models.DocumentItem, |