Merge branch 'corpus-admin-inlines' into 'master'

Fix corpus admin inlines display

Closes #610

See merge request !1171

arkindex/documents/admin.py

@@ -27,12 +27,11 @@ class ElementTypeInline(admin.TabularInline):
 class CorpusAdmin(admin.ModelAdmin):
     list_display = ('id', 'name', 'public', 'repository')
     search_fields = ('name', )
-    inlines = (ElementTypeInline, )
+    inlines = (ElementTypeInline, UserMembershipInline, GroupMembershipInline)
 
     def has_delete_permission(self, request, obj=None):
         # Require everyone to use the asynchronous corpus deletion
         return False
-    inlines = (UserMembershipInline, GroupMembershipInline)
 
 
 class ClassificationInline(admin.TabularInline):