mirror of
https://github.com/django-q2/django-q2.git
synced 2026-10-08 07:08:12 +08:00
truncate error description in admin
Also removes old conditional imports
This commit is contained in:
+3
-5
@@ -34,8 +34,7 @@ class TaskAdmin(admin.ModelAdmin):
|
|||||||
|
|
||||||
def get_readonly_fields(self, request, obj=None):
|
def get_readonly_fields(self, request, obj=None):
|
||||||
"""Set all fields readonly."""
|
"""Set all fields readonly."""
|
||||||
return list(self.readonly_fields) + \
|
return list(self.readonly_fields) + [field.name for field in obj._meta.fields]
|
||||||
[field.name for field in obj._meta.fields]
|
|
||||||
|
|
||||||
|
|
||||||
def retry_failed(FailAdmin, request, queryset):
|
def retry_failed(FailAdmin, request, queryset):
|
||||||
@@ -56,7 +55,7 @@ class FailAdmin(admin.ModelAdmin):
|
|||||||
'func',
|
'func',
|
||||||
'started',
|
'started',
|
||||||
'stopped',
|
'stopped',
|
||||||
'result'
|
'short_result'
|
||||||
)
|
)
|
||||||
|
|
||||||
def has_add_permission(self, request):
|
def has_add_permission(self, request):
|
||||||
@@ -70,8 +69,7 @@ class FailAdmin(admin.ModelAdmin):
|
|||||||
|
|
||||||
def get_readonly_fields(self, request, obj=None):
|
def get_readonly_fields(self, request, obj=None):
|
||||||
"""Set all fields readonly."""
|
"""Set all fields readonly."""
|
||||||
return list(self.readonly_fields) + \
|
return list(self.readonly_fields) + [field.name for field in obj._meta.fields]
|
||||||
[field.name for field in obj._meta.fields]
|
|
||||||
|
|
||||||
|
|
||||||
class ScheduleAdmin(admin.ModelAdmin):
|
class ScheduleAdmin(admin.ModelAdmin):
|
||||||
|
|||||||
+7
-4
@@ -1,8 +1,7 @@
|
|||||||
from django import get_version
|
from django import get_version
|
||||||
try:
|
from django.template.defaultfilters import truncatechars
|
||||||
from django.urls import reverse
|
|
||||||
except ImportError: # Django < 1.10
|
from django.urls import reverse
|
||||||
from django.core.urlresolvers import reverse
|
|
||||||
from django.utils.html import format_html
|
from django.utils.html import format_html
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
from django.db import models
|
from django.db import models
|
||||||
@@ -82,6 +81,10 @@ class Task(models.Model):
|
|||||||
def time_taken(self):
|
def time_taken(self):
|
||||||
return (self.stopped - self.started).total_seconds()
|
return (self.stopped - self.started).total_seconds()
|
||||||
|
|
||||||
|
@property
|
||||||
|
def short_result(self):
|
||||||
|
return truncatechars(self.result, 100)
|
||||||
|
|
||||||
def __unicode__(self):
|
def __unicode__(self):
|
||||||
return u'{}'.format(self.name or self.id)
|
return u'{}'.format(self.name or self.id)
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,4 @@
|
|||||||
try:
|
from django.urls import reverse
|
||||||
from django.urls import reverse
|
|
||||||
except ImportError: # Django < 1.10
|
|
||||||
from django.core.urlresolvers import reverse
|
|
||||||
from django.utils import timezone
|
from django.utils import timezone
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
|
|||||||
Reference in New Issue
Block a user