add option 'hidden'. You can hide news from newsfeed (e.g. about)

This commit is contained in:
2020-09-05 16:08:14 +00:00
parent 3a72946206
commit d4d23e7ca3
6 changed files with 26 additions and 12 deletions

View File

@@ -5,7 +5,7 @@ from posts.models import Post, FetMeeting, Event
def index(request): def index(request):
posts = deque(Post.articles.all()) posts = deque(Post.articles.get_visible_articles())
def get_tags(lst): def get_tags(lst):
for p in lst: for p in lst:

View File

@@ -22,9 +22,9 @@ make_fetmeeting.short_description = "In eine Fachschaftssitzung konvertieren"
class MyPostAdmin(admin.ModelAdmin): class MyPostAdmin(admin.ModelAdmin):
form = MyPostForm form = MyPostForm
model = Post model = Post
list_filter = ['is_pinned'] list_filter = ['is_pinned', 'is_hidden']
list_display = ['title', 'subtitle', 'slug', 'public_date', 'is_pinned'] list_display = ['title', 'subtitle', 'slug', 'public_date', 'is_pinned', 'is_hidden']
ordering = ['-public_date'] ordering = ['is_hidden', '-public_date']
def add_view(self, request, form_url='', extra_context=None): def add_view(self, request, form_url='', extra_context=None):
extra_context = extra_context or {} extra_context = extra_context or {}

View File

@@ -23,7 +23,7 @@ class MyNewsForm(MyPostForm):
model = News model = News
fields = [ fields = [
'title', 'subtitle', 'tags', 'image', 'body', 'slug', 'author', 'public_date', 'title', 'subtitle', 'tags', 'image', 'body', 'slug', 'author', 'public_date',
'is_pinned', 'is_pinned', 'is_hidden',
] ]
widgets = {'body': CKEditorUploadingWidget(config_name='default')} widgets = {'body': CKEditorUploadingWidget(config_name='default')}

View File

@@ -7,6 +7,9 @@ class PostManager(models.Manager):
def get_queryset(self): def get_queryset(self):
return super().get_queryset() return super().get_queryset()
def get_visible_articles(self):
return self.get_queryset().filter(is_hidden=False)
class ArticleManager(models.Manager): class ArticleManager(models.Manager):
""" """
@@ -19,8 +22,11 @@ class ArticleManager(models.Manager):
| Q(post_type='N') | Q(post_type='N')
).order_by('-public_date') ).order_by('-public_date')
def get_visible_articles(self):
return self.get_queryset().filter(is_hidden=False)
def get_pinned_article(self): def get_pinned_article(self):
return self.get_queryset().filter(is_pinned=True) return self.get_visible_articles().filter(is_pinned=True)
class NewsManager(models.Manager): class NewsManager(models.Manager):
@@ -30,6 +36,9 @@ class NewsManager(models.Manager):
def get_queryset(self): def get_queryset(self):
return super().get_queryset().filter(post_type='N') return super().get_queryset().filter(post_type='N')
def get_visible_articles(self):
return self.get_queryset().filter(is_hidden=False)
class AllEventManager(models.Manager): class AllEventManager(models.Manager):
""" """

View File

@@ -74,6 +74,9 @@ class Post(models.Model):
# post is pinned at main page # post is pinned at main page
is_pinned = models.BooleanField(default=False) is_pinned = models.BooleanField(default=False)
# post is hidden from newsfeed (e.g. about)
is_hidden = models.BooleanField(default=False)
# Zusatz Info wenn ein Event gepostet wird # Zusatz Info wenn ein Event gepostet wird
event_start = models.DateTimeField('Event Start', null=True, blank=True) event_start = models.DateTimeField('Event Start', null=True, blank=True)
event_end = models.DateTimeField('Event Ende', null=True, blank=True) event_end = models.DateTimeField('Event Ende', null=True, blank=True)

View File

@@ -23,7 +23,7 @@ from collections import deque
################## ##################
def index(request): def index(request):
posts = deque(Post.objects.order_by('-public_date').all()) posts = deque(Post.objects.get_visible_articles().order_by('-public_date'))
def f(p): def f(p):
return p.tags return p.tags
@@ -33,21 +33,23 @@ def index(request):
def tags(request, tag=""): def tags(request, tag=""):
posts = deque(Post.objects.filter(tags__name=tag)) posts = deque(Post.objects.get_visible_articles().filter(tags__name=tag))
featured_post = Post.objects.filter(slug=tag).first() featured_post = Post.objects.get_visible_articles().filter(slug=tag).first()
context = { context = {
"posts": posts, "posts": posts,
"featured_post": featured_post, "featured_post": featured_post,
"tags_list": None, "tags_list": None,
} }
return render(request, 'posts/tag.html', context) return render(request, 'posts/tag.html', context)
def show(request, id=None): def show(request, id=None):
if id.isdigit() or id is int: if id.isdigit() or id is int:
p = Post.objects.get(id=int(id)) p = Post.objects.get_visible_articles().get(id=int(id))
elif id != "" and id is not None: elif id != "" and id is not None:
p = Post.objects.get(slug=(id)) p = Post.objects.get_visible_articles().get(slug=(id))
# post_author = Member.all_members.filter(nickname=p.author) # post_author = Member.all_members.filter(nickname=p.author)
@@ -108,7 +110,7 @@ def tag_complete(request):
def get_next_dict(): def get_next_dict():
# TODO: Docstring # TODO: Docstring
posts = Post.articles.values('slug') posts = Post.articles.get_visible_articles().values('slug')
print(posts) print(posts)
d = {} d = {}
print(d) print(d)