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

@ -1,5 +1,6 @@
from django.contrib import admin
from suit.admin import SortableTabularInline, SortableModelAdmin
from suit.admin import SortableGenericTabularInline
import aircox.programs.models as programs
import aircox.cms.admin as cms
@ -7,12 +8,14 @@ import aircox.website.models as models
import aircox.website.forms as forms
class TrackInline(SortableTabularInline):
fields = ['artist', 'name', 'tags', 'position']
class TrackInline(SortableGenericTabularInline):
ct_field = 'related_type'
ct_fk_field = 'related_id'
form = forms.TrackForm
model = programs.Track
sortable = 'position'
extra = 4
fields = ['artist', 'title', 'tags', 'info', 'position']
admin.site.register(models.Article, cms.PostAdmin)
admin.site.register(models.Program, cms.RelatedPostAdmin)

View File

@ -122,7 +122,7 @@ class Diffusion(cms.RelatedPost):
self.rel_to_post()
self.fill_empty()
if not self.subtitle:
if not self.subtitle and hasattr(self, 'related'):
self.subtitle = _('Diffusion of the %(date)s') % {
'date': self.related.start.strftime('%A %d/%m')
}