Merge branch 'master' of lysithea.proxience.net:/home/proxience/git/ishtar

1 files changed, 8 insertions, 5 deletions

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)