summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archaeological_finds/admin.py3
-rw-r--r--archaeological_warehouse/admin.py19
2 files changed, 19 insertions, 3 deletions
diff --git a/archaeological_finds/admin.py b/archaeological_finds/admin.py
index 733d5ba5f..a43793414 100644
--- a/archaeological_finds/admin.py
+++ b/archaeological_finds/admin.py
@@ -18,8 +18,7 @@
# See the file COPYING for details.
from ajax_select import make_ajax_form
-from ajax_select.fields import AutoCompleteSelectField, \
- AutoCompleteSelectMultipleField
+from ajax_select.fields import AutoCompleteSelectField
from django import forms
from django.contrib import admin
diff --git a/archaeological_warehouse/admin.py b/archaeological_warehouse/admin.py
index 723935547..deaffde94 100644
--- a/archaeological_warehouse/admin.py
+++ b/archaeological_warehouse/admin.py
@@ -17,6 +17,8 @@
# 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
@@ -30,6 +32,13 @@ class WarehouseAdmin(HistorizedObjectAdmin):
list_filter = ('warehouse_type',)
search_fields = ('name', 'town')
model = models.Warehouse
+ form = make_ajax_form(model, {
+ 'town': 'town',
+ 'person_in_charge': 'person'
+ })
+ readonly_fields = HistorizedObjectAdmin.readonly_fields + [
+ 'imports'
+ ]
admin_site.register(models.Warehouse, WarehouseAdmin)
@@ -42,10 +51,18 @@ class ContainerTypeAdmin(admin.ModelAdmin):
admin_site.register(models.ContainerType, ContainerTypeAdmin)
-class ContainerAdmin(admin.ModelAdmin):
+class ContainerAdmin(HistorizedObjectAdmin):
list_display = ('reference', 'location', 'container_type',)
list_filter = ("container_type",)
model = models.Container
+ readonly_fields = HistorizedObjectAdmin.readonly_fields + [
+ 'imports', 'history_date'
+ ]
+ form = make_ajax_form(model, {
+ 'location': 'warehouse',
+ 'responsible': 'warehouse'
+ })
+
admin_site.register(models.Container, ContainerAdmin)