Merge branch 'master' into v0.9

1 files changed, 8 insertions, 12 deletions

diff --git a/archaeological_operations/admin.py b/archaeological_operations/admin.py
index 2a0ec652c..34e6da2ca 100644
--- a/archaeological_operations/admin.py
+++ b/archaeological_operations/admin.py
@@ -24,17 +24,15 @@ from ishtar_common.admin import HistorizedObjectAdmin, GeneralTypeAdmin
 
 import models
 
-FILES_AVAILABLE = 'archaeological_files' in settings.INSTALLED_APPS
 
-if FILES_AVAILABLE:
-    class AdministrativeActAdmin(HistorizedObjectAdmin):
-        list_display = ('year', 'index', 'operation', 'associated_file',
-                        'act_type')
-        list_filter = ('act_type',)
-        search_fields = ('year', 'index')
-        model = models.AdministrativeAct
+class AdministrativeActAdmin(HistorizedObjectAdmin):
+    list_display = ('year', 'index', 'operation', 'associated_file',
+                    'act_type')
+    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):
@@ -78,9 +76,7 @@ admin.site.register(models.OperationSource, OperationSourceAdmin)
 
 
 class ParcelAdmin(HistorizedObjectAdmin):
-    list_display = ['section', 'parcel_number', 'operation']
-    if FILES_AVAILABLE:
-        list_display.append('associated_file')
+    list_display = ['section', 'parcel_number', 'operation', 'associated_file']
     search_fields = ('operation__name',)
     model = models.Parcel