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

1 files changed, 6 insertions, 6 deletions

diff --git a/ishtar/furnitures/admin.py b/ishtar/furnitures/admin.py
index 83862f32a..c3408b387 100644
--- a/ishtar/furnitures/admin.py
+++ b/ishtar/furnitures/admin.py
@@ -101,14 +101,14 @@ class DatingAdmin(admin.ModelAdmin):
 
 admin.site.register(models.Dating, DatingAdmin)
 
-class RegistrationUnitAdmin(HistorizedObjectAdmin):
+class ContextRecordAdmin(HistorizedObjectAdmin):
     list_display = ('label', 'lenght', 'width',
                     'thickness', 'depth')
     list_filter = ('has_furniture',)
     search_fields = ('parcel__operation__name', "datings__period__label")
-    model = models.RegistrationUnit
+    model = models.ContextRecord
 
-admin.site.register(models.RegistrationUnit, RegistrationUnitAdmin)
+admin.site.register(models.ContextRecord, ContextRecordAdmin)
 
 class SourceAdmin(admin.ModelAdmin):
     list_display = ('title', 'source_type',)
@@ -119,8 +119,8 @@ class SourceAdmin(admin.ModelAdmin):
 admin.site.register(models.Source, SourceAdmin)
 
 class BaseItemAdmin(HistorizedObjectAdmin):
-    list_display = ('label', 'registration_unit', 'is_isolated')
-    search_fields = ('label', 'registration_unit__parcel__operation__name',)
+    list_display = ('label', 'context_record', 'is_isolated')
+    search_fields = ('label', 'context_record__parcel__operation__name',)
     model = models.BaseItem
 
 admin.site.register(models.BaseItem, BaseItemAdmin)
@@ -201,7 +201,7 @@ basic_models = [models.PersonType, models.IshtarUser, models.FileType,
                 models.SourceType, models.MaterialType, models.ParcelOwner,
                 models.WarehouseType, models.ActType, models.AuthorType,
                 models.OrganizationType, models.TreatmentType,
-                models.RemainType, models.PermitType]
+                models.RemainType, models.PermitType, models.Unit]
 if settings.COUNTRY == 'fr':
     basic_models += [models.Arrondissement, models.Canton, models.SaisineType]