diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2021-09-09 11:07:01 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2022-12-12 12:20:58 +0100 |
commit | 3297cdadc31ea857ed51317081d7d3174af7dbc9 (patch) | |
tree | 206966ec7684d85811f7a8686fd781d3ab9d9fd4 /archaeological_warehouse | |
parent | 07e3e2e9c3da9f05634a45f65723504c229f2baa (diff) | |
download | Ishtar-3297cdadc31ea857ed51317081d7d3174af7dbc9.tar.bz2 Ishtar-3297cdadc31ea857ed51317081d7d3174af7dbc9.zip |
Migration to Django 2.2 - fixes
- remove django-ajax-select
- fix migrations
Diffstat (limited to 'archaeological_warehouse')
-rw-r--r-- | archaeological_warehouse/admin.py | 26 | ||||
-rw-r--r-- | archaeological_warehouse/lookups.py | 47 | ||||
-rw-r--r-- | archaeological_warehouse/migrations/0101_squashed.py | 4 | ||||
-rw-r--r-- | archaeological_warehouse/migrations/0111_auto_20210225_1039.py | 2 |
4 files changed, 13 insertions, 66 deletions
diff --git a/archaeological_warehouse/admin.py b/archaeological_warehouse/admin.py index c186950d3..dad92881d 100644 --- a/archaeological_warehouse/admin.py +++ b/archaeological_warehouse/admin.py @@ -17,8 +17,6 @@ # See the file COPYING for details. -from ajax_select import make_ajax_form - from django.contrib import admin from ishtar_common.apps import admin_site @@ -36,18 +34,13 @@ class DivisionInline(admin.TabularInline): class WarehouseAdmin(HistorizedObjectAdmin): list_display = ("name", "warehouse_type", "town") list_filter = ("warehouse_type",) - search_fields = ("name", "town") + search_fields = ("name", "town", "warehouse_type") model = models.Warehouse - ajax_form_dict = HistorizedObjectAdmin.AJAX_FORM_DICT.copy() - ajax_form_dict.update( - { - "town": "town", - "precise_town": "town", - "person_in_charge": "person", - "organization": "organization", - } - ) - form = make_ajax_form(model, ajax_form_dict) + autocomplete_fields = HistorizedObjectAdmin.autocomplete_fields + [ + "precise_town", + "person_in_charge", + "organization" + ] inlines = [DivisionInline] exclude = ["documents", "main_image"] @@ -79,11 +72,12 @@ class ContainerAdmin(HistorizedObjectAdmin): "container_type", ) list_filter = ("container_type",) + search_fields = ("reference", "container_type", "cached_label", "responsible") model = models.Container readonly_fields = HistorizedObjectAdmin.readonly_fields + ["history_date"] - ajax_form_dict = HistorizedObjectAdmin.AJAX_FORM_DICT.copy() - ajax_form_dict.update({"location": "warehouse", "responsible": "warehouse"}) - form = make_ajax_form(model, ajax_form_dict) + autocomplete_fields = HistorizedObjectAdmin.autocomplete_fields + [ + "location", "responsible" + ] exclude = ["documents", "main_image"] diff --git a/archaeological_warehouse/lookups.py b/archaeological_warehouse/lookups.py deleted file mode 100644 index 9b221ea5b..000000000 --- a/archaeological_warehouse/lookups.py +++ /dev/null @@ -1,47 +0,0 @@ -from ajax_select import register - -from ishtar_common.lookups import LookupChannel - -from django.db.models import Q -from django.utils.encoding import force_text -from django.utils.html import escape - -from archaeological_warehouse import models - - -@register("container") -class ContainerLookup(LookupChannel): - model = models.Container - - def get_query(self, q, request): - query = Q() - for term in q.strip().split(" "): - subquery = ( - Q(reference__icontains=term) - | Q(container_type__label__icontains=term) - | Q(cached_label__icontains=term) - | Q(responsible__name__icontains=term) - ) - query &= subquery - return self.model.objects.filter(query).order_by("cached_label")[:20] - - def format_match(self, obj): - return escape(force_text(obj.cached_label)) - - def format_item_display(self, item): - return "<span class='ajax-label'>%s</span>" % item.cached_label - - -@register("warehouse") -class WarehouseLookup(LookupChannel): - model = models.Warehouse - - def get_query(self, q, request): - query = Q() - for term in q.strip().split(" "): - subquery = Q(warehouse_type__label=term) | Q(name__icontains=term) - query &= subquery - return self.model.objects.filter(query).order_by("name")[:20] - - def format_item_display(self, item): - return "<span class='ajax-label'>%s</span>" % item.name diff --git a/archaeological_warehouse/migrations/0101_squashed.py b/archaeological_warehouse/migrations/0101_squashed.py index 77fccef09..b98679dd7 100644 --- a/archaeological_warehouse/migrations/0101_squashed.py +++ b/archaeological_warehouse/migrations/0101_squashed.py @@ -90,7 +90,7 @@ class Migration(migrations.Migration): 'verbose_name': 'Container', 'verbose_name_plural': 'Containers', 'ordering': ('cached_label',), - 'permissions': (('view_container', 'Can view all Containers'), ('view_own_container', 'Can view own Container'), ('add_own_container', 'Can add own Container'), ('change_own_container', 'Can change own Container'), ('delete_own_container', 'Can delete own Container')), + 'permissions': (('view_own_container', 'Can view own Container'), ('add_own_container', 'Can add own Container'), ('change_own_container', 'Can change own Container'), ('delete_own_container', 'Can delete own Container')), }, bases=(ishtar_common.models.DocumentItem, ishtar_common.models.StatisticItem, ishtar_common.models.TemplateItem, models.Model, ishtar_common.models.CachedGen, ishtar_common.models_common.FixAssociated, ishtar_common.models.CascasdeUpdate, ishtar_common.models.ImageContainerModel, ishtar_common.models.OwnPerms, ishtar_common.models.MainItem), @@ -182,7 +182,7 @@ class Migration(migrations.Migration): options={ 'verbose_name': 'Warehouse', 'verbose_name_plural': 'Warehouses', - 'permissions': (('view_warehouse', 'Can view all Warehouses'), ('view_own_warehouse', 'Can view own Warehouse'), ('add_own_warehouse', 'Can add own Warehouse'), ('change_own_warehouse', 'Can change own Warehouse'), ('delete_own_warehouse', 'Can delete own Warehouse')), + 'permissions': (('view_own_warehouse', 'Can view own Warehouse'), ('add_own_warehouse', 'Can add own Warehouse'), ('change_own_warehouse', 'Can change own Warehouse'), ('delete_own_warehouse', 'Can delete own Warehouse')), }, bases=(ishtar_common.models.StatisticItem, ishtar_common.models.TemplateItem, ishtar_common.models.DocumentItem, models.Model, ishtar_common.models.CachedGen, ishtar_common.models_common.FixAssociated, ishtar_common.models.CascasdeUpdate, ishtar_common.models.ImageContainerModel, ishtar_common.models.DashboardFormItem, ishtar_common.models.OwnPerms, ishtar_common.models.MainItem), diff --git a/archaeological_warehouse/migrations/0111_auto_20210225_1039.py b/archaeological_warehouse/migrations/0111_auto_20210225_1039.py index f68b468f2..5802af221 100644 --- a/archaeological_warehouse/migrations/0111_auto_20210225_1039.py +++ b/archaeological_warehouse/migrations/0111_auto_20210225_1039.py @@ -15,7 +15,7 @@ class Migration(migrations.Migration): operations = [ migrations.AlterModelOptions( name='container', - options={'ordering': ('location', 'index', 'cached_label'), 'permissions': (('view_container', 'Can view all Containers'), ('view_own_container', 'Can view own Container'), ('add_own_container', 'Can add own Container'), ('change_own_container', 'Can change own Container'), ('delete_own_container', 'Can delete own Container')), 'verbose_name': 'Container', 'verbose_name_plural': 'Containers'}, + options={'ordering': ('location', 'index', 'cached_label'), 'permissions': (('view_own_container', 'Can view own Container'), ('add_own_container', 'Can add own Container'), ('change_own_container', 'Can change own Container'), ('delete_own_container', 'Can delete own Container')), 'verbose_name': 'Container', 'verbose_name_plural': 'Containers'}, ), migrations.AlterField( model_name='container', |