Merge branch 'develop' into feature/vue3

# Conflicts:
#	.github/workflows/ci.yml
#	.gitignore
#	requirements.txt
This commit is contained in:
vabene1111
2024-03-02 07:41:07 +01:00
112 changed files with 33936 additions and 186 deletions

View File

@@ -1740,8 +1740,9 @@ def log_cooking(request, recipe_id):
return {'error': 'recipe does not exist'}
@group_required('user')
def get_plan_ical(request, from_date, to_date):
@api_view(['GET'])
@permission_classes([CustomIsUser & CustomTokenHasReadWriteScope])
def get_plan_ical(request, from_date=datetime.date.today(), to_date=None):
queryset = MealPlan.objects.filter(Q(created_by=request.user)
| Q(shared=request.user)).filter(space=request.user.userspace_set.filter(active=1).first().space).distinct().all()