Taking in changes from andis

This commit is contained in:
2020-06-13 00:26:41 +02:00
3 changed files with 25 additions and 4 deletions

View File

@@ -13,6 +13,9 @@ from django.db.models import Q
from datetime import timedelta
import logging
logger = logging.getLogger('posts')
#TODO: is_fetsitzung -> is_fetmeeting
############
@@ -108,11 +111,27 @@ class Post(models.Model):
if self.image:
return self.image.url
else:
return ""
image=self.find_an_image()
if image:
return image.url
else:
return ""
def key(self):
return self.slug or self.id
def find_an_image(self):
"find an image via another post"
posts1=Post.objects.filter(slug__in=self.tags.names()).filter(image__isnull=False)[0:1].all() # Query all posts that have a slug that equals one of the tags
if len(posts1)>0:
return posts1.get().image
posts2=self.tags.similar_objects()
for p in posts2:
if p.image is not None:
return p.image
return None
@property
def url(self):
return reverse('posts.show', kwargs={"id":self.slug})
@@ -136,6 +155,7 @@ class PostSerializer(serializers.HyperlinkedModelSerializer):
fields = ['slug', 'title', 'subtitle', 'body', 'url', 'public_date',
'legacy_id', 'image', 'event_start', 'event_end',
'is_fetsitzung']
class News(Post):
class Meta:
proxy = True
@@ -192,4 +212,4 @@ class FetMeeting(Event):
if not self.event_end:
self.event_end = self.event_start + timedelta(hours=2)
super().save(*args, **kwargs)
super().save(*args, **kwargs)