Allow non-specified to/from dates for ical.

This commit is contained in:
c0mputerguru
2024-02-24 20:31:58 -08:00
committed by GitHub
parent 59ecc40dc6
commit 86b80a78d6
2 changed files with 3 additions and 1 deletions

View File

@@ -128,6 +128,8 @@ urlpatterns = [
path('api/get_recipe_file/<int:recipe_id>/', api.get_recipe_file, name='api_get_recipe_file'), path('api/get_recipe_file/<int:recipe_id>/', api.get_recipe_file, name='api_get_recipe_file'),
path('api/sync_all/', api.sync_all, name='api_sync'), path('api/sync_all/', api.sync_all, name='api_sync'),
path('api/log_cooking/<int:recipe_id>/', api.log_cooking, name='api_log_cooking'), path('api/log_cooking/<int:recipe_id>/', api.log_cooking, name='api_log_cooking'),
path('api/plan-ical/', api.get_plan_ical, name='api_get_plan_ical_future'),
path('api/plan-ical/<slug:from_date>/', api.get_plan_ical, name='api_get_plan_ical_from'),
path('api/plan-ical/<slug:from_date>/<slug:to_date>/', api.get_plan_ical, name='api_get_plan_ical'), path('api/plan-ical/<slug:from_date>/<slug:to_date>/', api.get_plan_ical, name='api_get_plan_ical'),
path('api/recipe-from-source/', api.RecipeUrlImportView.as_view(), name='api_recipe_from_source'), path('api/recipe-from-source/', api.RecipeUrlImportView.as_view(), name='api_recipe_from_source'),
path('api/backup/', api.get_backup, name='api_backup'), path('api/backup/', api.get_backup, name='api_backup'),

View File

@@ -1758,7 +1758,7 @@ def log_cooking(request, recipe_id):
@group_required('user') @group_required('user')
def get_plan_ical(request, from_date, to_date): def get_plan_ical(request, from_date=datetime.date.today(), to_date=None):
queryset = MealPlan.objects.filter( queryset = MealPlan.objects.filter(
Q(created_by=request.user) | Q(shared=request.user) Q(created_by=request.user) | Q(shared=request.user)
).filter(space=request.user.userspace_set.filter(active=1).first().space).distinct().all() ).filter(space=request.user.userspace_set.filter(active=1).first().space).distinct().all()