cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

re enabled basic sharing

Browse Source
This commit is contained in:
vabene1111 2020-06-11 17:27:27 +02:00
parent ead3c6ef76
commit 5072859e57
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cookbook/templates/meal_plan.html
View File

@ -317,8 +317,8 @@
this.default_shared_users = [{% for u in request.user.userpreference.plan_share.all %} this.default_shared_users = [{% for u in request.user.userpreference.plan_share.all %}
{{ u.pk }}, {{ u.pk }},
{% endfor %}] {% endfor %}]
this.$set(this.user_names, {{ request.user.pk }}, '{{ request.user.get_user_name }}') this.$set(this.user_names, {{ request.user.pk }}, '{{ request.user.get_user_name }}')
this.user_id_update = Array.from(this.default_shared_users) this.user_id_update = Array.from(this.default_shared_users)
this.updatePlan(); this.updatePlan();
@ -357,12 +357,18 @@
buildGrid: function () { buildGrid: function () {
console.log("BUILD GRID EXECUTED") console.log("BUILD GRID EXECUTED")
this.meal_plan = {} this.meal_plan = {}
for (let e of this.plan_entries) {
let new_type = {id: e.meal_type, name: e.meal_type_name,}
if (this.meal_types.filter(el => el.id === new_type.id).length === 0){
this.meal_types.push(new_type)
}
}
for (let t of this.meal_types) { for (let t of this.meal_types) {
this.$set(this.meal_plan, t.id, { this.$set(this.meal_plan, t.id, {
name: t.name, name: t.name,
meal_type: t.id, meal_type: t.id,
type: t,
days: {} days: {}
}) })
for (let d of this.days) { for (let d of this.days) {

2
cookbook/views/api.py
View File

@ -43,7 +43,7 @@ class MealPlanViewSet(viewsets.ModelViewSet):
permission_classes = [permissions.IsAuthenticated] permission_classes = [permissions.IsAuthenticated]
def get_queryset(self): def get_queryset(self):
queryset = MealPlan.objects.filter(Q(created_by=self.request.user) or Q(shared=self.request.user)).all() queryset = MealPlan.objects.filter(Q(created_by=self.request.user) | Q(shared=self.request.user)).distinct().all()
week = self.request.query_params.get('html_week', None) week = self.request.query_params.get('html_week', None)
if week is not None: if week is not None:
y, w = week.replace('-W', ' ').split() y, w = week.replace('-W', ' ').split()