Skip to content

Commit 75636d1

Browse files
committed
Add static/ paths to gitignore for Silk plugin (used for debugging)
1 parent ab6f093 commit 75636d1

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
dwitter/settings/local.py
55
dwitter/static/CACHE/*
66
dwitter/static/admin/*
7+
dwitter/static/silk/*
8+
dwitter/static/rest_framework/*
9+
dwitter/static/debug_toolbar/*
710
*.db
811
.gitignore
912
.*.sw*

dwitter/serializers_v2.py

-2
Original file line numberDiff line numberDiff line change
@@ -159,5 +159,3 @@ class Meta:
159159
'remixes',
160160
'has_user_awesomed',
161161
)
162-
163-

dwitter/views_v2.py

+2-5
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,9 @@ class DweetViewSet(mixins.RetrieveModelMixin,
7070
viewsets.GenericViewSet):
7171
queryset = Dweet.objects.all().select_related(
7272
'author',
73+
'reply_to',
74+
'reply_to__author'
7375
).prefetch_related(
74-
Prefetch('reply_to', queryset=Dweet.objects.select_related('author')),
75-
'likes',
7676
Prefetch('remixes'),
7777
Prefetch('comments', queryset=Comment.objects.select_related('author'))
7878
).annotate(
@@ -140,9 +140,6 @@ def list(self, request):
140140
if hashtag:
141141
filters['hashtag__name'] = hashtag
142142

143-
if order_by == '-awesome_count':
144-
self.queryset = self.queryset.annotate(awesome_count=Count('likes'))
145-
146143
self.queryset = self.queryset.annotate(
147144
has_user_awesomed=Exists(Dweet.objects.filter(
148145
id=OuterRef('id'), likes__in=[request.user.id]))

0 commit comments

Comments
 (0)