Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Make the custom viewset that checks correct updates more flexible

Roland Geider3dab6fd24f54
diff --git a/wger/core/api/views.py b/wger/core/api/views.py
index 9e3bfa9fe..0976225bc 100644
--- a/wger/core/api/views.py
+++ b/wger/core/api/views.py
@@ -46,7 +46,7 @@ class UserProfileViewSet(viewsets.ModelViewSet):
'''
Return objects to check for ownership permission
'''
- return [User.objects.get(pk=self.request.DATA['user'])]
+ return [(User, 'user')]
class LanguageViewSet(viewsets.ReadOnlyModelViewSet):
diff --git a/wger/manager/api/views.py b/wger/manager/api/views.py
index 34fc5a493..33740a70d 100644
--- a/wger/manager/api/views.py
+++ b/wger/manager/api/views.py
@@ -103,7 +103,7 @@ class WorkoutSessionViewSet(WgerOwnerObjectModelViewSet):
'''
Return objects to check for ownership permission
'''
- return [Workout.objects.get(pk=self.request.DATA['workout'])]
+ return [(Workout, 'workout')]
class ScheduleStepViewSet(WgerOwnerObjectModelViewSet):
@@ -137,8 +137,8 @@ class ScheduleStepViewSet(WgerOwnerObjectModelViewSet):
'''
Return objects to check for ownership permission
'''
- return [Workout.objects.get(pk=self.request.DATA['workout']),
- Schedule.objects.get(pk=self.request.DATA['schedule'])]
+ return [(Workout, 'workout'),
+ (Schedule, 'schedule')]
class ScheduleViewSet(viewsets.ModelViewSet):
@@ -186,7 +186,7 @@ class DayViewSet(WgerOwnerObjectModelViewSet):
'''
Return objects to check for ownership permission
'''
- return [Workout.objects.get(pk=self.request.DATA['training'])]
+ return [(Workout, 'training')]
class SetViewSet(WgerOwnerObjectModelViewSet):
@@ -211,7 +211,7 @@ class SetViewSet(WgerOwnerObjectModelViewSet):
'''
Return objects to check for ownership permission
'''
- return [Day.objects.get(pk=self.request.DATA['exerciseday'])]
+ return [(Day, 'exerciseday')]
class SettingViewSet(WgerOwnerObjectModelViewSet):
@@ -243,7 +243,7 @@ class SettingViewSet(WgerOwnerObjectModelViewSet):
'''
Return objects to check for ownership permission
'''
- return [Set.objects.get(pk=self.request.DATA['set'])]
+ return [(Set, 'set')]
class WorkoutLogViewSet(WgerOwnerObjectModelViewSet):
@@ -276,4 +276,4 @@ class WorkoutLogViewSet(WgerOwnerObjectModelViewSet):
'''
Return objects to check for ownership permission
'''
- return [Workout.objects.get(pk=self.request.DATA['workout'])]
+ return [(Workout, 'workout')]
diff --git a/wger/nutrition/api/views.py b/wger/nutrition/api/views.py
index 0de304346..246085a1f 100644
--- a/wger/nutrition/api/views.py
+++ b/wger/nutrition/api/views.py
@@ -211,7 +211,7 @@ class MealViewSet(WgerOwnerObjectModelViewSet):
'''
Return objects to check for ownership permission
'''
- return [NutritionPlan.objects.get(pk=self.request.DATA['plan'])]
+ return [(NutritionPlan, 'plan')]
@link()
def nutritional_values(self, request, pk):
@@ -250,7 +250,7 @@ class MealItemViewSet(WgerOwnerObjectModelViewSet):
'''
Return objects to check for ownership permission
'''
- return [Meal.objects.get(pk=self.request.DATA['meal'])]
+ return [(Meal, 'meal')]
@link()
def nutritional_values(self, request, pk):
diff --git a/wger/utils/viewsets.py b/wger/utils/viewsets.py
index b0114d8c2..778cbbcb5 100644
--- a/wger/utils/viewsets.py
+++ b/wger/utils/viewsets.py
@@ -28,9 +28,12 @@ class WgerOwnerObjectModelViewSet(viewsets.ModelViewSet):
'''
Check for creation (PUT, POST)
'''
- for obj in self.get_owner_objects():
- if obj.get_owner_object().user != request.user:
- raise exceptions.PermissionDenied('You are not allowed to do this')
+ for entry in self.get_owner_objects():
+ if request.DATA.get(entry[1]):
+ pk = request.DATA.get(entry[1])
+ obj = entry[0].objects.get(pk=pk)
+ if obj.get_owner_object().user != request.user:
+ raise exceptions.PermissionDenied('You are not allowed to do this')
else:
return super(WgerOwnerObjectModelViewSet, self).create(request, *args, **kwargs)
@@ -38,8 +41,11 @@ class WgerOwnerObjectModelViewSet(viewsets.ModelViewSet):
'''
Check for updates (PUT, PATCH)
'''
- for obj in self.get_owner_objects():
- if obj.get_owner_object().user != request.user:
- raise exceptions.PermissionDenied('You are not allowed to do this')
+ for entry in self.get_owner_objects():
+ if request.DATA.get(entry[1]):
+ pk = request.DATA.get(entry[1])
+ obj = entry[0].objects.get(pk=pk)
+ if obj.get_owner_object().user != request.user:
+ raise exceptions.PermissionDenied('You are not allowed to do this')
else:
- return super(WgerOwnerObjectModelViewSet, self).create(request, *args, **kwargs)
+ return super(WgerOwnerObjectModelViewSet, self).update(request, *args, **kwargs)