6 files changed, 34 insertions, 25 deletions
diff --git a/archaeological_context_records/admin.py b/archaeological_context_records/admin.py
index 5985f4462..7d6b6be15 100644
--- a/archaeological_context_records/admin.py
+++ b/archaeological_context_records/admin.py
@@ -20,7 +20,7 @@
 from django.conf import settings
 from django.contrib import admin
 
-from ishtar_common.admin import HistorizedObjectAdmin
+from ishtar_common.admin import HistorizedObjectAdmin, GeneralTypeAdmin
 
 import models
 
@@ -49,8 +49,8 @@ class ContextRecordSourceAdmin(admin.ModelAdmin):
 
 admin.site.register(models.ContextRecordSource, ContextRecordSourceAdmin)
 
-basic_models = [models.DatingType, models.DatingQuality,
-                models.Unit, models.ActivityType, models.IdentificationType]
+general_models = [models.DatingType, models.DatingQuality,
+                  models.Unit, models.ActivityType, models.IdentificationType]
+for model in general_models:
+    admin.site.register(model, GeneralTypeAdmin)
 
-for model in basic_models:
-    admin.site.register(model)
diff --git a/archaeological_files/admin.py b/archaeological_files/admin.py
index 339b19661..e1a5da1d1 100644
--- a/archaeological_files/admin.py
+++ b/archaeological_files/admin.py
@@ -20,7 +20,7 @@
 from django.conf import settings
 from django.contrib import admin
 
-from ishtar_common.admin import HistorizedObjectAdmin
+from ishtar_common.admin import HistorizedObjectAdmin, GeneralTypeAdmin
 
 import models
 
@@ -35,8 +35,8 @@ class FileAdmin(HistorizedObjectAdmin):
 
 admin.site.register(models.File, FileAdmin)
 
-basic_models = [models.FileType, models.PermitType]
+general_models = [models.FileType, models.PermitType]
 if settings.COUNTRY == 'fr':
-    basic_models.append(models.SaisineType)
-for model in basic_models:
-    admin.site.register(model)
+    general_models.append(models.SaisineType)
+for model in general_models:
+    admin.site.register(model, GeneralTypeAdmin)
diff --git a/archaeological_finds/admin.py b/archaeological_finds/admin.py
index 096f05bf3..04259b368 100644
--- a/archaeological_finds/admin.py
+++ b/archaeological_finds/admin.py
@@ -20,7 +20,7 @@
 from django.conf import settings
 from django.contrib import admin
 
-from ishtar_common.admin import HistorizedObjectAdmin
+from ishtar_common.admin import HistorizedObjectAdmin, GeneralTypeAdmin
 
 import models
 
@@ -70,6 +70,6 @@ class TreatmentSourceAdmin(admin.ModelAdmin):
 
 admin.site.register(models.TreatmentSource, TreatmentSourceAdmin)
 
-basic_models = [models.MaterialType, models.TreatmentType]
-for model in basic_models:
-    admin.site.register(model)
+general_models = [models.MaterialType, models.TreatmentType]
+for model in general_models:
+    admin.site.register(model, GeneralTypeAdmin)
diff --git a/archaeological_operations/admin.py b/archaeological_operations/admin.py
index de8b47edc..01b125e60 100644
--- a/archaeological_operations/admin.py
+++ b/archaeological_operations/admin.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Copyright (C) 2012 Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
+# Copyright (C) 2012-2013 Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -20,7 +20,7 @@
 from django.conf import settings
 from django.contrib import admin
 
-from ishtar_common.admin import HistorizedObjectAdmin
+from ishtar_common.admin import HistorizedObjectAdmin, GeneralTypeAdmin
 
 import models
 
@@ -33,7 +33,7 @@ class AdministrativeActAdmin(HistorizedObjectAdmin):
 admin.site.register(models.AdministrativeAct, AdministrativeActAdmin)
 
 class PeriodAdmin(admin.ModelAdmin):
-    list_display = ('label', 'start_date', 'end_date', 'parent')
+    list_display = ('label', 'start_date', 'end_date', 'parent', 'available')
     model = models.Period
 
 admin.site.register(models.Period, PeriodAdmin)
@@ -66,7 +66,10 @@ class ParcelAdmin(HistorizedObjectAdmin):
 
 admin.site.register(models.Parcel, ParcelAdmin)
 
-basic_models = [models.OperationType, models.RemainType, models.ActType,
-                models.ParcelOwner]
+general_models = [models.OperationType, models.RemainType, models.ActType]
+for model in general_models:
+    admin.site.register(model, GeneralTypeAdmin)
+
+basic_models = [models.ParcelOwner]
 for model in basic_models:
     admin.site.register(model)
diff --git a/archaeological_warehouse/admin.py b/archaeological_warehouse/admin.py
index cf026e86c..b76c48308 100644
--- a/archaeological_warehouse/admin.py
+++ b/archaeological_warehouse/admin.py
@@ -20,7 +20,7 @@
 from django.conf import settings
 from django.contrib import admin
 
-from ishtar_common.admin import HistorizedObjectAdmin
+from ishtar_common.admin import HistorizedObjectAdmin, GeneralTypeAdmin
 
 import models
 
@@ -46,6 +46,6 @@ class ContainerAdmin(admin.ModelAdmin):
 
 admin.site.register(models.Container, ContainerAdmin)
 
-basic_models = [models.WarehouseType]
-for model in basic_models:
-    admin.site.register(model)
+general_models = [models.WarehouseType]
+for model in general_models:
+    admin.site.register(model, GeneralTypeAdmin)
diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py
index 8f6a07f88..b470f8223 100644
--- a/ishtar_common/admin.py
+++ b/ishtar_common/admin.py
@@ -81,8 +81,14 @@ class PersonTypeAdmin(admin.ModelAdmin):
 
 admin.site.register(models.PersonType, PersonTypeAdmin)
 
-basic_models = [models.IshtarUser, models.SourceType, models.AuthorType,
-                models.OrganizationType]
+class GeneralTypeAdmin(admin.ModelAdmin):
+    list_display = ('label', 'txt_idx', 'available')
+
+general_models = [models.OrganizationType, models.SourceType, models.AuthorType]
+for model in general_models:
+    admin.site.register(model, GeneralTypeAdmin)
+
+basic_models = [models.IshtarUser]
 if settings.COUNTRY == 'fr':
     basic_models += [models.Arrondissement, models.Canton]