sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

some error catching around has-teams and api permissions

Browse Source
This commit is contained in:
Sander Roosendaal
2017-04-07 08:24:10 +02:00
parent 70fdd5452e
commit 8658176cc9
2 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
rowers/urls.py
View File

@@ -37,8 +37,12 @@ class WorkoutViewSet(viewsets.ModelViewSet):
serializer_class = WorkoutSerializer serializer_class = WorkoutSerializer
def get_queryset(self): def get_queryset(self):
r = Rower.objects.get(user=self.request.user) try:
return Workout.objects.filter(user=r).order_by("-date","-starttime") r = Rower.objects.get(user=self.request.user)
return Workout.objects.filter(user=r).order_by("-date","-starttime")
except TypeError:
return []
permission_classes = ( permission_classes = (
@@ -52,8 +56,11 @@ class RowerViewSet(viewsets.ModelViewSet):
#queryset = Rower.objects.all() #queryset = Rower.objects.all()
def get_queryset(self): def get_queryset(self):
r = Rower.objects.filter(user=self.request.user) try:
return r r = Rower.objects.filter(user=self.request.user)
return r
except TypeError:
return []
permission_classes = ( permission_classes = (
IsOwnerOrNot, IsOwnerOrNot,
@@ -68,8 +75,11 @@ class FavoriteChartViewSet(viewsets.ModelViewSet):
#queryset = FavoriteChart.objects.all() #queryset = FavoriteChart.objects.all()
def get_queryset(self): def get_queryset(self):
r = Rower.objects.filter(user=self.request.user) try:
return FavoriteChart.objects.filter(user=r) r = Rower.objects.filter(user=self.request.user)
return FavoriteChart.objects.filter(user=r)
except TypeError:
return []
permission_classes = ( permission_classes = (
IsOwnerOrNot, IsOwnerOrNot,

11
rowers/views.py
View File

@@ -173,10 +173,13 @@ def rdata(file,rower=rrower()):
# Query to get teams managed and member of # Query to get teams managed and member of
def get_my_teams(user): def get_my_teams(user):
therower = Rower.objects.get(user=user) try:
teams1 = therower.team.all() therower = Rower.objects.get(user=user)
teams2 = Team.objects.filter(manager=user) teams1 = therower.team.all()
teams = list(set(teams1).union(set(teams2))) teams2 = Team.objects.filter(manager=user)
teams = list(set(teams1).union(set(teams2)))
except TypeError:
teams = []
return teams return teams