Minor improvements
This commit is contained in:
+6
-5
@@ -50,10 +50,10 @@ class EventViewSet(ModelViewSet):
|
||||
|
||||
def get_queryset(self):
|
||||
|
||||
if self.request.method == 'POST' or self.request.method == 'PUT':
|
||||
return Event.objects.all()
|
||||
|
||||
if self.request.user.is_authenticated:
|
||||
# TODO: For create and update, this return old data in signupForm field (prefetched)...
|
||||
if self.request.user.is_authenticated or \
|
||||
self.request.method == 'POST' or \
|
||||
self.request.method == 'PUT':
|
||||
return Event.objects.all().prefetch_related(
|
||||
Prefetch('signupForm', queryset=SignupForm.objects.all(), to_attr='filtered_signup_forms')
|
||||
)
|
||||
@@ -117,7 +117,7 @@ class SignupViewSet(ModelViewSet):
|
||||
uuid = request.query_params.get("uuid", None)
|
||||
queryset = self.filter_queryset(self.get_queryset())
|
||||
filter = {'pk': pk, 'uuid': uuid}
|
||||
signup = get_object_or_404(queryset, **filter)
|
||||
get_object_or_404(queryset, **filter)
|
||||
if request.method == 'GET':
|
||||
return self.retrieve(request, *args, **kwargs)
|
||||
elif request.method == 'PUT':
|
||||
@@ -179,6 +179,7 @@ class FeedViewSet(ModelViewSet):
|
||||
else:
|
||||
objs = Feed.objects.filter(visible=True).order_by('publish_time')
|
||||
|
||||
# TODO: Bad filtering. Rewrite!
|
||||
result_ids = []
|
||||
for obj in objs:
|
||||
if obj.autohide_enabled:
|
||||
|
||||
Reference in New Issue
Block a user