- extra column in events grid with location & time
- bugfixes in locationwidget
- prepared email notifications
This commit is contained in:
Martin Bauer
2013-11-01 12:42:57 +01:00
parent cd635aff9b
commit 82de9eaa84
56 changed files with 800 additions and 44 deletions

View File

@@ -15,12 +15,13 @@ class Event ( models.Model ):
( 'Reh', _('Rehearsal') ),
( 'Conc', _('Concert') ),
( 'Party', _('Party') ),
( 'Travel', _('Travel') )
( 'Travel', _('Travel') ),
( 'Option', _('Option') ),
)
type = models.CharField( max_length=6, choices=EVENT_TYPES, default='Reh', verbose_name= _("type") )
short_desc = models.CharField( null=True, max_length=100, blank = True, verbose_name= _("Short Description") )
location = models.TextField( blank=False, verbose_name=_("location") )
location = models.TextField( blank=True, verbose_name=_("location") )
map_location = PlainLocationField(blank=True, based_field = location, zoom=7, verbose_name=_("Location on map") )
desc = models.TextField( blank=True, verbose_name=_("description") )
@@ -49,7 +50,7 @@ class Event ( models.Model ):
def title(self):
res = self.get_type_display()
if ( self.short_desc ):
res += " ( " + self.short_desc + " ) "
res += " (" + self.short_desc + ") "
return res