timeout before cancel a diffusion in monitoring

This commit is contained in:
bkfox
2016-07-19 23:13:04 +02:00
parent 1be3bf1e74
commit 4bbffa9a50
8 changed files with 63 additions and 17 deletions

View File

@ -27,7 +27,7 @@ class StreamInline(admin.TabularInline):
class SoundInline(admin.TabularInline):
fields = ['type', 'path', 'duration']
readonly_fields = fields
# readonly_fields = fields
model = Sound
extra = 0
@ -148,10 +148,6 @@ class DiffusionAdmin(admin.ModelAdmin):
def get_queryset(self, request):
qs = super().get_queryset(request)
print('type__exact' in request.GET,
request.GET.get('type__exact'),
Diffusion.Type.unconfirmed,
request.GET.get('type__exact') == Diffusion.Type.unconfirmed)
if request.GET and len(request.GET):
return qs
return qs.exclude(type = Diffusion.Type.unconfirmed)

View File

@ -587,7 +587,7 @@ class DiffusionManager(models.Manager):
date.
"""
date = date or tz.now()
if issubclass(type(date), datetime.date):
if not issubclass(type(date), datetime.datetime):
return self.filter(
models.Q(start__contains = date) | \
models.Q(end__contains = date)