Reformat using black
This commit is contained in:
cuom1999
parent
efee4ad081
commit
a87fb49918
221 changed files with 19127 additions and 7310 deletions
|
|
@ -11,23 +11,28 @@ from reversion_compare.admin import CompareVersionAdmin
|
|||
|
||||
from judge.dblock import LockModel
|
||||
from judge.models import NavigationBar
|
||||
from judge.widgets import AdminHeavySelect2MultipleWidget, AdminHeavySelect2Widget, HeavyPreviewAdminPageDownWidget
|
||||
from judge.widgets import (
|
||||
AdminHeavySelect2MultipleWidget,
|
||||
AdminHeavySelect2Widget,
|
||||
HeavyPreviewAdminPageDownWidget,
|
||||
)
|
||||
|
||||
|
||||
class NavigationBarAdmin(DraggableMPTTAdmin):
|
||||
list_display = DraggableMPTTAdmin.list_display + ('key', 'linked_path')
|
||||
fields = ('key', 'label', 'path', 'order', 'regex', 'parent')
|
||||
list_display = DraggableMPTTAdmin.list_display + ("key", "linked_path")
|
||||
fields = ("key", "label", "path", "order", "regex", "parent")
|
||||
list_editable = () # Bug in SortableModelAdmin: 500 without list_editable being set
|
||||
mptt_level_indent = 20
|
||||
sortable = 'order'
|
||||
sortable = "order"
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
super(NavigationBarAdmin, self).__init__(*args, **kwargs)
|
||||
self.__save_model_calls = 0
|
||||
|
||||
def linked_path(self, obj):
|
||||
return format_html(u'<a href="{0}" target="_blank">{0}</a>', obj.path)
|
||||
linked_path.short_description = _('link path')
|
||||
return format_html('<a href="{0}" target="_blank">{0}</a>', obj.path)
|
||||
|
||||
linked_path.short_description = _("link path")
|
||||
|
||||
def save_model(self, request, obj, form, change):
|
||||
self.__save_model_calls += 1
|
||||
|
|
@ -36,7 +41,9 @@ class NavigationBarAdmin(DraggableMPTTAdmin):
|
|||
def changelist_view(self, request, extra_context=None):
|
||||
self.__save_model_calls = 0
|
||||
with NavigationBar.objects.disable_mptt_updates():
|
||||
result = super(NavigationBarAdmin, self).changelist_view(request, extra_context)
|
||||
result = super(NavigationBarAdmin, self).changelist_view(
|
||||
request, extra_context
|
||||
)
|
||||
if self.__save_model_calls:
|
||||
with LockModel(write=(NavigationBar,)):
|
||||
NavigationBar.objects.rebuild()
|
||||
|
|
@ -46,74 +53,105 @@ class NavigationBarAdmin(DraggableMPTTAdmin):
|
|||
class BlogPostForm(ModelForm):
|
||||
def __init__(self, *args, **kwargs):
|
||||
super(BlogPostForm, self).__init__(*args, **kwargs)
|
||||
self.fields['authors'].widget.can_add_related = False
|
||||
self.fields["authors"].widget.can_add_related = False
|
||||
|
||||
class Meta:
|
||||
widgets = {
|
||||
'authors': AdminHeavySelect2MultipleWidget(data_view='profile_select2', attrs={'style': 'width: 100%'}),
|
||||
'organizations': AdminHeavySelect2MultipleWidget(data_view='organization_select2',
|
||||
attrs={'style': 'width: 100%'}),
|
||||
"authors": AdminHeavySelect2MultipleWidget(
|
||||
data_view="profile_select2", attrs={"style": "width: 100%"}
|
||||
),
|
||||
"organizations": AdminHeavySelect2MultipleWidget(
|
||||
data_view="organization_select2", attrs={"style": "width: 100%"}
|
||||
),
|
||||
}
|
||||
|
||||
if HeavyPreviewAdminPageDownWidget is not None:
|
||||
widgets['content'] = HeavyPreviewAdminPageDownWidget(preview=reverse_lazy('blog_preview'))
|
||||
widgets['summary'] = HeavyPreviewAdminPageDownWidget(preview=reverse_lazy('blog_preview'))
|
||||
widgets["content"] = HeavyPreviewAdminPageDownWidget(
|
||||
preview=reverse_lazy("blog_preview")
|
||||
)
|
||||
widgets["summary"] = HeavyPreviewAdminPageDownWidget(
|
||||
preview=reverse_lazy("blog_preview")
|
||||
)
|
||||
|
||||
|
||||
class BlogPostAdmin(CompareVersionAdmin):
|
||||
fieldsets = (
|
||||
(None, {'fields': ('title', 'slug', 'authors', 'visible', 'sticky', 'publish_on',
|
||||
'is_organization_private', 'organizations')}),
|
||||
(_('Content'), {'fields': ('content', 'og_image')}),
|
||||
(_('Summary'), {'classes': ('collapse',), 'fields': ('summary',)}),
|
||||
(
|
||||
None,
|
||||
{
|
||||
"fields": (
|
||||
"title",
|
||||
"slug",
|
||||
"authors",
|
||||
"visible",
|
||||
"sticky",
|
||||
"publish_on",
|
||||
"is_organization_private",
|
||||
"organizations",
|
||||
)
|
||||
},
|
||||
),
|
||||
(_("Content"), {"fields": ("content", "og_image")}),
|
||||
(_("Summary"), {"classes": ("collapse",), "fields": ("summary",)}),
|
||||
)
|
||||
prepopulated_fields = {'slug': ('title',)}
|
||||
list_display = ('id', 'title', 'visible', 'sticky', 'publish_on')
|
||||
list_display_links = ('id', 'title')
|
||||
ordering = ('-publish_on',)
|
||||
prepopulated_fields = {"slug": ("title",)}
|
||||
list_display = ("id", "title", "visible", "sticky", "publish_on")
|
||||
list_display_links = ("id", "title")
|
||||
ordering = ("-publish_on",)
|
||||
form = BlogPostForm
|
||||
date_hierarchy = 'publish_on'
|
||||
date_hierarchy = "publish_on"
|
||||
|
||||
def has_change_permission(self, request, obj=None):
|
||||
return (request.user.has_perm('judge.edit_all_post') or
|
||||
request.user.has_perm('judge.change_blogpost') and (
|
||||
obj is None or
|
||||
obj.authors.filter(id=request.profile.id).exists()))
|
||||
return (
|
||||
request.user.has_perm("judge.edit_all_post")
|
||||
or request.user.has_perm("judge.change_blogpost")
|
||||
and (obj is None or obj.authors.filter(id=request.profile.id).exists())
|
||||
)
|
||||
|
||||
|
||||
class SolutionForm(ModelForm):
|
||||
def __init__(self, *args, **kwargs):
|
||||
super(SolutionForm, self).__init__(*args, **kwargs)
|
||||
self.fields['authors'].widget.can_add_related = False
|
||||
self.fields["authors"].widget.can_add_related = False
|
||||
|
||||
class Meta:
|
||||
widgets = {
|
||||
'authors': AdminHeavySelect2MultipleWidget(data_view='profile_select2', attrs={'style': 'width: 100%'}),
|
||||
'problem': AdminHeavySelect2Widget(data_view='problem_select2', attrs={'style': 'width: 250px'}),
|
||||
"authors": AdminHeavySelect2MultipleWidget(
|
||||
data_view="profile_select2", attrs={"style": "width: 100%"}
|
||||
),
|
||||
"problem": AdminHeavySelect2Widget(
|
||||
data_view="problem_select2", attrs={"style": "width: 250px"}
|
||||
),
|
||||
}
|
||||
|
||||
if HeavyPreviewAdminPageDownWidget is not None:
|
||||
widgets['content'] = HeavyPreviewAdminPageDownWidget(preview=reverse_lazy('solution_preview'))
|
||||
widgets["content"] = HeavyPreviewAdminPageDownWidget(
|
||||
preview=reverse_lazy("solution_preview")
|
||||
)
|
||||
|
||||
|
||||
class LicenseForm(ModelForm):
|
||||
class Meta:
|
||||
if HeavyPreviewAdminPageDownWidget is not None:
|
||||
widgets = {'text': HeavyPreviewAdminPageDownWidget(preview=reverse_lazy('license_preview'))}
|
||||
widgets = {
|
||||
"text": HeavyPreviewAdminPageDownWidget(
|
||||
preview=reverse_lazy("license_preview")
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
class LicenseAdmin(admin.ModelAdmin):
|
||||
fields = ('key', 'link', 'name', 'display', 'icon', 'text')
|
||||
list_display = ('name', 'key')
|
||||
fields = ("key", "link", "name", "display", "icon", "text")
|
||||
list_display = ("name", "key")
|
||||
form = LicenseForm
|
||||
|
||||
|
||||
class UserListFilter(admin.SimpleListFilter):
|
||||
title = _('user')
|
||||
parameter_name = 'user'
|
||||
title = _("user")
|
||||
parameter_name = "user"
|
||||
|
||||
def lookups(self, request, model_admin):
|
||||
return User.objects.filter(is_staff=True).values_list('id', 'username')
|
||||
return User.objects.filter(is_staff=True).values_list("id", "username")
|
||||
|
||||
def queryset(self, request, queryset):
|
||||
if self.value():
|
||||
|
|
@ -122,10 +160,24 @@ class UserListFilter(admin.SimpleListFilter):
|
|||
|
||||
|
||||
class LogEntryAdmin(admin.ModelAdmin):
|
||||
readonly_fields = ('user', 'content_type', 'object_id', 'object_repr', 'action_flag', 'change_message')
|
||||
list_display = ('__str__', 'action_time', 'user', 'content_type', 'object_link', 'diff_link')
|
||||
search_fields = ('object_repr', 'change_message')
|
||||
list_filter = (UserListFilter, 'content_type')
|
||||
readonly_fields = (
|
||||
"user",
|
||||
"content_type",
|
||||
"object_id",
|
||||
"object_repr",
|
||||
"action_flag",
|
||||
"change_message",
|
||||
)
|
||||
list_display = (
|
||||
"__str__",
|
||||
"action_time",
|
||||
"user",
|
||||
"content_type",
|
||||
"object_link",
|
||||
"diff_link",
|
||||
)
|
||||
search_fields = ("object_repr", "change_message")
|
||||
list_filter = (UserListFilter, "content_type")
|
||||
list_display_links = None
|
||||
actions = None
|
||||
|
||||
|
|
@ -144,25 +196,35 @@ class LogEntryAdmin(admin.ModelAdmin):
|
|||
else:
|
||||
ct = obj.content_type
|
||||
try:
|
||||
link = format_html('<a href="{1}">{0}</a>', obj.object_repr,
|
||||
reverse('admin:%s_%s_change' % (ct.app_label, ct.model), args=(obj.object_id,)))
|
||||
link = format_html(
|
||||
'<a href="{1}">{0}</a>',
|
||||
obj.object_repr,
|
||||
reverse(
|
||||
"admin:%s_%s_change" % (ct.app_label, ct.model),
|
||||
args=(obj.object_id,),
|
||||
),
|
||||
)
|
||||
except NoReverseMatch:
|
||||
link = obj.object_repr
|
||||
return link
|
||||
object_link.admin_order_field = 'object_repr'
|
||||
object_link.short_description = _('object')
|
||||
|
||||
object_link.admin_order_field = "object_repr"
|
||||
object_link.short_description = _("object")
|
||||
|
||||
def diff_link(self, obj):
|
||||
if obj.is_deletion():
|
||||
return None
|
||||
ct = obj.content_type
|
||||
try:
|
||||
url = reverse('admin:%s_%s_history' % (ct.app_label, ct.model), args=(obj.object_id,))
|
||||
link = format_html('<a href="{1}">{0}</a>', _('Diff'), url)
|
||||
url = reverse(
|
||||
"admin:%s_%s_history" % (ct.app_label, ct.model), args=(obj.object_id,)
|
||||
)
|
||||
link = format_html('<a href="{1}">{0}</a>', _("Diff"), url)
|
||||
except NoReverseMatch:
|
||||
link = None
|
||||
return link
|
||||
diff_link.short_description = _('diff')
|
||||
|
||||
diff_link.short_description = _("diff")
|
||||
|
||||
def queryset(self, request):
|
||||
return super().queryset(request).prefetch_related('content_type')
|
||||
return super().queryset(request).prefetch_related("content_type")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue