Merge branch 'admin-activity' into 'master'

Add activity state to dataimport admin

Closes #710

See merge request !1309

arkindex/dataimport/admin.py

@@ -28,12 +28,12 @@ class DataImportAdmin(admin.ModelAdmin):
     list_display = ('id', 'creator', 'corpus', 'state', 'mode')
     list_filter = [('mode', EnumFieldListFilter), ]
     fieldsets = (
-        (None, {'fields': ('id', 'creator', 'corpus', 'state', 'mode', 'workflow')}),
+        (None, {'fields': ('id', 'creator', 'corpus', 'state', 'mode', 'workflow', 'activity_state')}),
         ('Elements filters', {
             'fields': ('element', 'element_type', 'folder_type', 'name_contains', 'best_class')
         }),
     )
-    readonly_fields = ('id', 'workflow', 'state')
+    readonly_fields = ('id', 'workflow', 'state', 'activity_state')
     raw_id_fields = ('element', )
     inlines = [DataFileInline, WorkerRunInline, ElementInline]