Merge branch 'develop' into 'master'
Develop See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!45
This commit is contained in:
+1
-1
@@ -113,7 +113,7 @@ class SignupFormViewSet(ModelViewSet):
|
|||||||
def get_queryset(self):
|
def get_queryset(self):
|
||||||
if self.request.user.is_authenticated:
|
if self.request.user.is_authenticated:
|
||||||
return SignupForm.objects.filter(deleted=False).order_by('start_time')
|
return SignupForm.objects.filter(deleted=False).order_by('start_time')
|
||||||
return SignupForm.objects.filter(deleted=False, visible=True, end_time__gt=timezone.now()).order_by('start_time')
|
return SignupForm.objects.filter(deleted=False, visible=True).order_by('start_time')
|
||||||
|
|
||||||
def destroy(self, request, pk=None, *args, **kwargs):
|
def destroy(self, request, pk=None, *args, **kwargs):
|
||||||
try:
|
try:
|
||||||
|
|||||||
Reference in New Issue
Block a user