Skip to content

No text fix #297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sh1nkey merged 3 commits into from
Feb 23, 2024
Merged

No text fix #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a04fe32
no text fix
sh1nkey Feb 22, 2024
a69d990
added comment
sh1nkey Feb 23, 2024
eafa5a5
Merge pull request #298 from PROCOLLAB-github/add_comment
sh1nkey Feb 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion feed/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from django.contrib.contenttypes.models import ContentType
from django.db.models import Q
from rest_framework.generics import CreateAPIView
from rest_framework.response import Response
from rest_framework.views import APIView
Expand Down Expand Up @@ -32,7 +33,8 @@ def get_queryset(self):
.filter(content_type__model__in=filters)
.order_by("-datetime_created")
)
return queryset
# временное удаление постов для проектов с текстом
return queryset.exclude(~Q(text=""), content_type__model="project")

def get(self, *args, **kwargs):
paginator = self.pagination_class()
Expand Down
3 changes: 2 additions & 1 deletion news/mixins.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@ def get_queryset_for_project(self):
except Project.DoesNotExist:
# TODO: raise http 404 here
return News.objects.none()
# временное удаление постов для проектов с текстом
return News.objects.get_news(obj=project).exclude(
content_type__model="project", text__is=None
text="", content_type__model="project"
)

def get_queryset_for_program(self):
Expand Down