Merge branch 'decoupage'

Conflicts:
	archaeological_operations/admin.py
	archaeological_operations/models.py

1 files changed, 8 insertions, 12 deletions

diff --git a/archaeological_operations/admin.py b/archaeological_operations/admin.py
index c012b00e2..3374bcef7 100644
--- a/archaeological_operations/admin.py
+++ b/archaeological_operations/admin.py
@@ -26,17 +26,15 @@ import models
 
 FILES_AVAILABLE = 'archaeological_files' in settings.INSTALLED_APPS
 
-class AdministrativeActAdmin(HistorizedObjectAdmin):
-    if FILES_AVAILABLE:
+if FILES_AVAILABLE:
+    class AdministrativeActAdmin(HistorizedObjectAdmin):
         list_display = ('year', 'index', 'operation', 'associated_file',
                         'act_type')
-    else:
-        list_display = ('year', 'index', 'operation', 'act_type')
-    list_filter = ('act_type',)
-    search_fields = ('year', 'index')
-    model = models.AdministrativeAct
+        list_filter = ('act_type',)
+        search_fields = ('year', 'index')
+        model = models.AdministrativeAct
 
-admin.site.register(models.AdministrativeAct, AdministrativeActAdmin)
+    admin.site.register(models.AdministrativeAct, AdministrativeActAdmin)
 
 class PeriodAdmin(admin.ModelAdmin):
     list_display = ('label', 'start_date', 'end_date', 'parent', 'available',
@@ -75,11 +73,9 @@ class OperationSourceAdmin(admin.ModelAdmin):
 admin.site.register(models.OperationSource, OperationSourceAdmin)
 
 class ParcelAdmin(HistorizedObjectAdmin):
+    list_display = ['section', 'parcel_number', 'operation',]
     if FILES_AVAILABLE:
-        list_display = ('section', 'parcel_number', 'operation',
-                        'associated_file')
-    else:
-        list_display = ('section', 'parcel_number', 'operation',)
+        list_display.append('associated_file')
     search_fields = ('operation__name',)
     model = models.Parcel