make user and group management more robust

- remove TaskResultInline and subclasses
- add custom perform_delete_selected action to UserAdmin and GroupAdmin
- properly clean asynchronous tasks in rabbitmq
- wrap user operations in transactions

gnuviechadmin/osusers/admin.py

@@ -25,30 +25,6 @@ class ShadowInline(admin.TabularInline):
     can_delete = False
 
 
-class TaskResultInline(admin.TabularInline):
-    can_delete = False
-    extra = 0
-    readonly_fields = ['task_uuid', 'task_name', 'is_finished', 'is_success',
-                       'state', 'result_body']
-
-    def get_queryset(self, request):
-        qs = super(TaskResultInline, self).get_queryset(request)
-        for entry in qs:
-            entry.update_taskstatus()
-        return qs
-
-    def has_add_permission(self, request, obj=None):
-        return False
-
-
-class UserTaskResultInline(TaskResultInline):
-    model = UserTaskResult
-
-
-class GroupTaskResultInline(TaskResultInline):
-    model = GroupTaskResult
-
-
 class UserCreationForm(forms.ModelForm):
     """
     A form for creating system users.
@@ -91,9 +67,10 @@ class UserCreationForm(forms.ModelForm):
 
 
 class UserAdmin(admin.ModelAdmin):
-    inlines = [AdditionalGroupInline, ShadowInline, UserTaskResultInline]
+    actions = ['perform_delete_selected']
     readonly_fields = ['uid']
     add_form = UserCreationForm
+    inlines = [AdditionalGroupInline, ShadowInline]
 
     add_fieldsets = (
         (None, {
@@ -115,37 +92,82 @@ class UserAdmin(admin.ModelAdmin):
         defaults.update(kwargs)
         return super(UserAdmin, self).get_form(request, obj, **defaults)
 
-    def get_inline_instances(self, request, obj=None):
-        if obj is None:
-            return []
-        return super(UserAdmin, self).get_inline_instances(request, obj)
+    def get_readonly_fields(self, request, obj=None):
+        if obj:
+            return ['uid']
+        return []
+
+    def perform_delete_selected(self, request, queryset):
+        for user in queryset.all():
+            user.delete()
+    perform_delete_selected.short_description = _('Delete selected users')
+
+    def get_actions(self, request):
+        actions = super(UserAdmin, self).get_actions(request)
+        if 'delete_selected' in actions:
+            del actions['delete_selected']
+        return actions
 
 
 class GroupAdmin(admin.ModelAdmin):
-    inlines = [GroupTaskResultInline]
+    actions = ['perform_delete_selected']
 
     def get_inline_instances(self, request, obj=None):
         if obj is None:
             return []
         return super(GroupAdmin, self).get_inline_instances(request, obj)
 
+    def perform_delete_selected(self, request, queryset):
+        for group in queryset.all():
+            group.delete()
+    perform_delete_selected.short_description = _('Delete selected groups')
 
-class DeleteTaskResultAdmin(admin.ModelAdmin):
-    readonly_fields = ['task_uuid', 'task_name', 'modeltype', 'modelname',
-                       'is_finished', 'is_success', 'state', 'result_body']
-    list_display = ('task_uuid', 'task_name', 'modeltype', 'modelname',
-                    'is_finished', 'state')
+    def get_actions(self, request):
+        actions = super(GroupAdmin, self).get_actions(request)
+        if 'delete_selected' in actions:
+            del actions['delete_selected']
+        return actions
 
+
+class TaskResultAdmin(admin.ModelAdmin):
     def has_add_permission(self, request, obj=None):
         return False
 
+    def has_delete_permission(self, request, obj=None):
+        return obj is None or obj.is_finished
+
     def get_queryset(self, request):
-        qs = super(DeleteTaskResultAdmin, self).get_queryset(request)
+        qs = super(TaskResultAdmin, self).get_queryset(request)
         for entry in qs:
             entry.update_taskstatus()
         return qs
 
 
+class DeleteTaskResultAdmin(TaskResultAdmin):
+    readonly_fields = ['task_uuid', 'task_name', 'modeltype', 'modelname',
+                       'is_finished', 'is_success', 'state', 'result_body']
+    list_display = ('task_uuid', 'task_name', 'modeltype', 'modelname',
+                    'is_finished', 'state')
+
+
+class GroupTaskResultAdmin(TaskResultAdmin):
+    readonly_fields = [
+        'task_uuid', 'task_name', 'group', 'is_finished', 'is_success',
+        'state', 'result_body'
+    ]
+    list_display = ('task_uuid', 'task_name', 'group', 'is_finished', 'state')
+
+
+class UserTaskResultAdmin(TaskResultAdmin):
+    readonly_fields = [
+        'task_uuid', 'task_name', 'user', 'is_finished', 'is_success', 'state',
+        'result_body'
+    ]
+    list_display = ('task_uuid', 'task_name', 'user', 'is_finished', 'state')
+
+
 admin.site.register(Group, GroupAdmin)
 admin.site.register(User, UserAdmin)
 admin.site.register(DeleteTaskResult, DeleteTaskResultAdmin)
+admin.site.register(GroupTaskResult, GroupTaskResultAdmin)
+admin.site.register(UserTaskResult, UserTaskResultAdmin)