Djangoization - Major refactoring (step 3)

Reorganization of views, urls, menus, admin, forms.
Changes on models.

1 files changed, 4 insertions, 154 deletions

diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py
index c4e5fa7f2..8f6a07f88 100644
--- a/ishtar_common/admin.py
+++ b/ishtar_common/admin.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010-2011 Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
+# Copyright (C) 2010-2012 É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
@@ -57,130 +57,6 @@ class PersonAdmin(HistorizedObjectAdmin):
 
 admin.site.register(models.Person, PersonAdmin)
 
-class FileAdmin(HistorizedObjectAdmin):
-    list_display = ['year', 'numeric_reference', 'internal_reference',
-                    'end_date', 'file_type', 'general_contractor',]
-    if settings.COUNTRY == 'fr':
-        list_display += ['saisine_type', 'reference_number']
-    list_filter = ("file_type", "year",)
-    search_fields = ('towns__name',)
-    model = models.File
-
-admin.site.register(models.File, FileAdmin)
-
-class OperationAdmin(HistorizedObjectAdmin):
-    list_display = ['year', 'operation_code', 'start_date',
-                    'excavation_end_date', 'end_date',
-                    'operation_type']
-    list_filter = ("year", "operation_type",)
-    search_fields = ['towns__name', 'operation_code']
-    if settings.COUNTRY == 'fr':
-        list_display += ['code_patriarche']
-        search_fields += ['code_patriarche']
-    model = models.Operation
-
-admin.site.register(models.Operation, OperationAdmin)
-
-class OperationSourceAdmin(admin.ModelAdmin):
-    list_display = ('operation', 'title', 'source_type',)
-    list_filter = ('source_type',)
-    search_fields = ('title', 'operation__name')
-    model = models.OperationSource
-
-admin.site.register(models.OperationSource, OperationSourceAdmin)
-
-class ParcelAdmin(HistorizedObjectAdmin):
-    list_display = ('section', 'parcel_number', 'operation', 'associated_file')
-    search_fields = ('operation__name',)
-    model = models.Parcel
-
-admin.site.register(models.Parcel, ParcelAdmin)
-
-class PeriodAdmin(admin.ModelAdmin):
-    list_display = ('label', 'start_date', 'end_date', 'parent')
-    model = models.Period
-
-admin.site.register(models.Period, PeriodAdmin)
-
-class DatingAdmin(admin.ModelAdmin):
-    list_display = ('period', 'start_date', 'end_date', 'dating_type',
-                    'quality')
-    list_filter = ("period", 'dating_type', 'quality')
-    model = models.Dating
-
-admin.site.register(models.Dating, DatingAdmin)
-
-class ContextRecordAdmin(HistorizedObjectAdmin):
-    list_display = ('label', 'length', 'width',
-                    'thickness', 'depth')
-    list_filter = ('has_furniture',)
-    search_fields = ('parcel__operation__name', "datings__period__label")
-    model = models.ContextRecord
-
-admin.site.register(models.ContextRecord, ContextRecordAdmin)
-
-class ContextRecordSourceAdmin(admin.ModelAdmin):
-    list_display = ('context_record', 'title', 'source_type',)
-    list_filter = ('source_type',)
-    search_fields = ('title', )
-    model = models.ContextRecordSource
-
-admin.site.register(models.ContextRecordSource, ContextRecordSourceAdmin)
-
-class BaseItemAdmin(HistorizedObjectAdmin):
-    list_display = ('label', 'context_record', 'is_isolated')
-    search_fields = ('label', 'context_record__parcel__operation__name',)
-    model = models.BaseItem
-
-admin.site.register(models.BaseItem, BaseItemAdmin)
-
-class ItemAdmin(HistorizedObjectAdmin):
-    list_display = ('label', 'material_type', 'dating', 'volume', 'weight',
-                    'item_number',)
-    list_filter = ('material_type',)
-    search_fields = ('label', "dating__period__label")
-    model = models.Item
-
-admin.site.register(models.Item, ItemAdmin)
-
-class ItemSourceAdmin(admin.ModelAdmin):
-    list_display = ('item', 'title', 'source_type',)
-    list_filter = ('source_type',)
-    search_fields = ('title', )
-    model = models.ItemSource
-
-admin.site.register(models.ItemSource, ItemSourceAdmin)
-
-class WarehouseAdmin(HistorizedObjectAdmin):
-    list_display = ('name', 'warehouse_type', 'town')
-    list_filter = ('warehouse_type',)
-    search_fields = ('name', 'town')
-    model = models.Warehouse
-
-admin.site.register(models.Warehouse, WarehouseAdmin)
-
-class AdministrativeActAdmin(HistorizedObjectAdmin):
-    list_display = ('operation', 'act_type', 'signature_date')
-    list_filter = ('act_type',)
-    search_fields = ('operation__name',)
-    model = models.AdministrativeAct
-
-admin.site.register(models.AdministrativeAct, AdministrativeActAdmin)
-
-class ContainerTypeAdmin(admin.ModelAdmin):
-    list_display = ('label', 'reference', 'length', 'width', 'height',
-                    'volume')
-    model = models.ContainerType
-
-admin.site.register(models.ContainerType, ContainerTypeAdmin)
-
-class ContainerAdmin(admin.ModelAdmin):
-    list_display = ('reference', 'location', 'container_type',)
-    list_filter = ("container_type",)
-    model = models.Container
-
-admin.site.register(models.Container, ContainerAdmin)
-
 class TownAdmin(admin.ModelAdmin):
     list_display = ['name',]
     search_fields = ['name']
@@ -199,42 +75,16 @@ class AuthorAdmin(admin.ModelAdmin):
 
 admin.site.register(models.Author, AuthorAdmin)
 
-class PropertyAdmin(admin.ModelAdmin):
-    list_display = ['item', 'person', 'start_date', 'end_date']
-    search_fields = ('item__label', 'person__name')
-    model = models.Property
-
-admin.site.register(models.Property, PropertyAdmin)
-
-class TreatmentAdmin(HistorizedObjectAdmin):
-    list_display = ('location', 'treatment_type', 'container', 'person')
-    list_filter = ('treatment_type',)
-    model = models.Treatment
-
-admin.site.register(models.Treatment, TreatmentAdmin)
-
-class TreatmentSourceAdmin(admin.ModelAdmin):
-    list_display = ('treatment', 'title', 'source_type',)
-    list_filter = ('source_type',)
-    search_fields = ('title',)
-    model = models.TreatmentSource
-
-admin.site.register(models.TreatmentSource, TreatmentSourceAdmin)
-
 class PersonTypeAdmin(admin.ModelAdmin):
     model = models.PersonType
     filter_vertical = ('rights',)
 
 admin.site.register(models.PersonType, PersonTypeAdmin)
 
-basic_models = [models.IshtarUser, models.FileType, models.OperationType,
-                models.DatingType, models.DatingQuality, models.SourceType,
-                models.MaterialType, models.ParcelOwner, models.WarehouseType,
-                models.ActType, models.AuthorType, models.OrganizationType,
-                models.TreatmentType, models.RemainType, models.PermitType,
-                models.Unit, models.ActivityType, models.IdentificationType]
+basic_models = [models.IshtarUser, models.SourceType, models.AuthorType,
+                models.OrganizationType]
 if settings.COUNTRY == 'fr':
-    basic_models += [models.Arrondissement, models.Canton, models.SaisineType]
+    basic_models += [models.Arrondissement, models.Canton]
 
 for model in basic_models:
     admin.site.register(model)