TTMK/web2.0-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into 'master'

Browse Source 
Merge feed list order fix to master

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!39
This commit is contained in:
Toni Lyttinen
2021-04-08 10:22:38 +00:00
parent 99739cd035 abbf23456b
commit 6a65ca32d7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
webapp/views.py
+3 -3
View File
@@ -230,9 +230,9 @@ class FeedViewSet(ModelViewSet):
def get_queryset(self):
if self.request.user.is_authenticated:
return Feed.objects.filter(deleted=False).order_by('publish_time')
return Feed.objects.filter(deleted=False).order_by('-publish_time')
else:
objs = Feed.objects.filter(deleted=False, visible=True).order_by('publish_time')
objs = Feed.objects.filter(deleted=False, visible=True).order_by('-publish_time')
# TODO: Bad filtering. Rewrite!
result_ids = []
@@ -243,7 +243,7 @@ class FeedViewSet(ModelViewSet):
else:
result_ids.append(obj.id)
return Feed.objects.filter(id__in=result_ids)
return Feed.objects.filter(id__in=result_ids).order_by('-publish_time')
def destroy(self, request, pk=None, *args, **kwargs):
try: