mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-01 04:10:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

added sharing to meal plan + fixed meal plan visibility

Browse Source
This commit is contained in:
vabene1111
2020-05-07 23:16:24 +02:00
parent edbc21df19
commit 2e23fcfd5d
6 changed files with 45 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cookbook/views/new.py
View File

@@ -128,7 +128,8 @@ class MealPlanCreate(GroupRequiredMixin, CreateView):
def get_initial(self):
return dict(
meal=self.request.GET['meal'] if 'meal' in self.request.GET else None,
date=datetime.strptime(self.request.GET['date'], '%Y-%m-%d') if 'date' in self.request.GET else None
date=datetime.strptime(self.request.GET['date'], '%Y-%m-%d') if 'date' in self.request.GET else None,
shared=self.request.user.userpreference.plan_share.all() if self.request.user.userpreference.plan_share else None
)
def form_valid(self, form):

3
cookbook/views/views.py
View File

@@ -130,7 +130,7 @@ def meal_plan(request):
plan[t[0]] = {'type_name': t[1], 'days': copy.deepcopy(days_dict)}
for d in days:
plan_day = MealPlan.objects.filter(date=d).all()
plan_day = MealPlan.objects.filter(date=d).filter(Q(created_by=request.user) | Q(shared=request.user)).distinct().all()
for p in plan_day:
plan[p.meal]['days'][d].append(p)
@@ -195,6 +195,7 @@ def settings(request):
up.default_unit = form.cleaned_data['default_unit']
up.default_page = form.cleaned_data['default_page']
up.search_style = form.cleaned_data['search_style']
up.plan_share.set(form.cleaned_data['plan_share'])
up.save()
if 'user_name_form' in request.POST: