Anna Sirota
caae613747
* removes all soft-deletion; * shows a "Delete extension" button on the draft page in case it can be deleted; * shows a "Delete version" button on the version page in case it can be deleted; * a version can be deleted if * its file isn't approved, and it doesn't have any ratings; * an extension can be deleted if * it's not listed, and doesn't have any ratings or abuse reports; * all it's versions can also be deleted; * changes default `File.status` from `APPROVED` to `AWAITING_REVIEW` With version's file status being `APPROVED` by default, a version can never be deleted, even when the extension is still a draft. This change doesn't affect the approval process because * when an extension is approved its latest version becomes approved automatically (no change here); * when a new version is uploaded to an approved extension, it's approved automatically (this is new). This allows authors to delete their drafts, freeing the extension slug and making it possible to re-upload the same file. This also makes it possible to easily fix mistakes during the drafting of a new extension (e.g. delete a version and re-upload it without bumping a version for each typo/mistake in packaging and so on). (see #78 and #63) Reviewed-on: #81
153 lines
3.6 KiB
Python
153 lines
3.6 KiB
Python
from django.contrib import admin
|
|
import background_task.admin
|
|
import background_task.models
|
|
|
|
from .models import File, FileValidation
|
|
import files.signals
|
|
|
|
|
|
def scan_selected_files(self, request, queryset):
|
|
"""Scan selected files."""
|
|
for instance in queryset:
|
|
files.signals.schedule_scan(instance)
|
|
|
|
|
|
class FileValidationInlineAdmin(admin.StackedInline):
|
|
model = FileValidation
|
|
readonly_fields = ('date_created', 'date_modified', 'is_ok', 'results')
|
|
extra = 0
|
|
|
|
def _nope(self, request, obj):
|
|
return False
|
|
|
|
has_add_permission = _nope
|
|
has_change_permission = _nope
|
|
has_delete_permission = _nope
|
|
|
|
|
|
@admin.register(File)
|
|
class FileAdmin(admin.ModelAdmin):
|
|
view_on_site = False
|
|
save_on_top = True
|
|
|
|
list_filter = (
|
|
'validation__is_ok',
|
|
'type',
|
|
'status',
|
|
'date_status_changed',
|
|
'date_approved',
|
|
)
|
|
list_display = ('original_name', 'extension', 'user', 'date_created', 'type', 'status', 'is_ok')
|
|
|
|
list_select_related = ('version__extension', 'user')
|
|
|
|
readonly_fields = (
|
|
'id',
|
|
'date_created',
|
|
'date_modified',
|
|
'date_approved',
|
|
'date_status_changed',
|
|
'size_bytes',
|
|
'user',
|
|
'original_hash',
|
|
'original_name',
|
|
'hash',
|
|
'content_type',
|
|
)
|
|
search_fields = (
|
|
'^version__extension__slug',
|
|
'^version__extension__name',
|
|
'extensions__slug',
|
|
'extensions__name',
|
|
)
|
|
|
|
fieldsets = (
|
|
(
|
|
None,
|
|
{
|
|
'fields': (
|
|
'id',
|
|
('source', 'thumbnail'),
|
|
('original_name', 'content_type'),
|
|
'type',
|
|
'status',
|
|
)
|
|
},
|
|
),
|
|
(
|
|
'Dates',
|
|
{
|
|
'fields': (
|
|
'date_created',
|
|
'date_modified',
|
|
'date_status_changed',
|
|
'date_approved',
|
|
)
|
|
},
|
|
),
|
|
(
|
|
'Details',
|
|
{
|
|
'fields': (
|
|
('hash', 'original_hash'),
|
|
'metadata',
|
|
'size_bytes',
|
|
'user',
|
|
),
|
|
},
|
|
),
|
|
)
|
|
|
|
inlines = [FileValidationInlineAdmin]
|
|
actions = [scan_selected_files]
|
|
|
|
def is_ok(self, obj):
|
|
return obj.validation.is_ok if hasattr(obj, 'validation') else None
|
|
|
|
is_ok.boolean = True
|
|
|
|
|
|
try:
|
|
admin.site.unregister(background_task.models.Task)
|
|
admin.site.unregister(background_task.models.CompletedTask)
|
|
except admin.site.NotRegistered:
|
|
pass
|
|
|
|
|
|
class TaskMixin:
|
|
"""Modify a few properties of background tasks displayed in admin."""
|
|
|
|
def no_errors(self, obj):
|
|
"""Replace background_task's "has_error".
|
|
|
|
Make Django's red/green boolean icons less confusing
|
|
in the context of "there's an error during task run".
|
|
"""
|
|
return not bool(obj.last_error)
|
|
|
|
no_errors.boolean = True
|
|
|
|
|
|
@admin.register(background_task.models.Task)
|
|
@admin.register(background_task.models.CompletedTask)
|
|
class TaskAdmin(background_task.admin.TaskAdmin, TaskMixin):
|
|
date_hierarchy = 'run_at'
|
|
list_display = [
|
|
'run_at',
|
|
'task_name',
|
|
'task_params',
|
|
'attempts',
|
|
'no_errors',
|
|
'locked_by',
|
|
'locked_by_pid_running',
|
|
]
|
|
list_filter = (
|
|
'task_name',
|
|
'run_at',
|
|
'failed_at',
|
|
'locked_at',
|
|
'attempts',
|
|
'creator_content_type',
|
|
)
|
|
search_fields = ['task_name', 'task_params', 'last_error', 'verbose_name']
|