Added Datefields for creation and last modied metadata. It's currently used for the sitemap.xml.

This commit is contained in:
2016-10-14 21:27:58 +02:00
parent 731828e1ee
commit 79efd1ce13
5 changed files with 120 additions and 57 deletions

View File

@@ -1,16 +1,18 @@
# -'- Encoding: utf-8 -*-
import os
from ckeditor.fields import RichTextField
from django.conf import settings
from django.core.urlresolvers import reverse
from django.core.exceptions import ValidationError
from django.core.urlresolvers import reverse
from django.db import models
from django.db.models import Q
from django.template.defaultfilters import slugify
from django.utils.timezone import now
from django.utils.translation import ugettext as _
from ckeditor.fields import RichTextField
from easy_thumbnails.fields import ThumbnailerImageField
from utils import COUNTRIES, OverwriteStorage
@@ -46,9 +48,9 @@ def get_upload_path(instance, filename):
class EventManager(models.Manager):
def get_queryset(self):
return super(EventManager, self).get_queryset().select_related('location')
return super(EventManager, self).get_queryset().select_related(
'location')
def current_event(self):
try:
@@ -104,13 +106,28 @@ class Event(models.Model):
null=True
)
photo_count = models.PositiveIntegerField(default=0, editable=False)
event_series = models.ForeignKey('Event', blank=True, null=True,
on_delete=models.SET_NULL, editable=True,
verbose_name=_('Event Series'),
help_text=_(u'Wenn dieser Event zu einer Veranstaltungsreihe gehört \
event_series = models.ForeignKey(
'Event',
blank=True,
null=True,
on_delete=models.SET_NULL, editable=True,
verbose_name=_('Event Series'),
help_text=_(u'Wenn dieser Event zu einer Veranstaltungsreihe gehört \
werden Ort, Beschreibung, Bild und Homepage von dem hier angegebenen \
Event übernommen.')
)
)
date_created = models.DateTimeField(
auto_now_add=True,
null=True,
db_index=True,
editable=False,
verbose_name=_('first created at'),
)
date_modified = models.DateTimeField(
auto_now=True,
editable=False,
verbose_name=_('latest updated at'),
)
objects = EventManager()
class Meta(object):
@@ -165,6 +182,10 @@ class Event(models.Model):
else:
return None
@property
def is_future_event(self):
return self.start > now()
def save(self, **kwargs):
# Fülle fehlende Felder mit den Angaben der Hauptveranstaltung aus.
if self.event_series:
@@ -197,6 +218,18 @@ class Location(models.Model):
street_address = models.CharField(_('Street Address'), max_length=127)
locality = models.CharField(_('Locality'), max_length=127)
country = models.CharField(_('Country'), max_length=2, choices=COUNTRIES)
date_created = models.DateTimeField(
auto_now_add=True,
db_index=True,
editable=False,
null=True,
verbose_name=_('first created at'),
)
date_modified = models.DateTimeField(
auto_now=True,
editable=False,
verbose_name=_('latest updated at'),
)
class Meta(object):
verbose_name = _('Venue')
@@ -212,7 +245,6 @@ class Location(models.Model):
class PhotoManager(models.Manager):
def get_random(self, startpage=True):
if startpage:
queryset = self.filter(on_startpage=True)
@@ -226,8 +258,11 @@ class PhotoManager(models.Manager):
class Photo(models.Model):
name = models.CharField(_("Name"), max_length=100, blank=True)
image = ThumbnailerImageField(_("Image"), upload_to=get_upload_path,
storage=OverwriteStorage())
image = ThumbnailerImageField(
_("Image"),
upload_to=get_upload_path,
storage=OverwriteStorage()
)
event = models.ForeignKey('events.Event')
description = models.TextField(
_("Description"),
@@ -247,6 +282,19 @@ class Photo(models.Model):
editable=False,
default=0
)
date_created = models.DateTimeField(
auto_now_add=True,
db_index=True,
editable=False,
null=True,
verbose_name=_('first created at'),
)
date_modified = models.DateTimeField(
auto_now=True,
editable=False,
verbose_name=_('latest updated at'),
)
objects = PhotoManager()
metadata = None
orientation = 1