shopping list tweaks
This commit is contained in:
@ -55,6 +55,13 @@ class IngredientFilter(django_filters.FilterSet):
|
|||||||
|
|
||||||
|
|
||||||
class ShoppingListFilter(django_filters.FilterSet):
|
class ShoppingListFilter(django_filters.FilterSet):
|
||||||
|
|
||||||
|
def __init__(self, data=None, *args, **kwargs):
|
||||||
|
if data is not None:
|
||||||
|
data = data.copy()
|
||||||
|
data.setdefault("finished", False)
|
||||||
|
super(ShoppingListFilter, self).__init__(data, *args, **kwargs)
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = ShoppingList
|
model = ShoppingList
|
||||||
fields = ['finished']
|
fields = ['finished']
|
||||||
|
@ -452,7 +452,9 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (this.shopping_list.entries.length === 0) {
|
||||||
|
this.edit_mode = true
|
||||||
|
}
|
||||||
}).catch((err) => {
|
}).catch((err) => {
|
||||||
console.log(err)
|
console.log(err)
|
||||||
this.makeToast('{% trans 'Error' %}', '{% trans 'There was an error loading a resource!' %}' + err.bodyText, 'danger')
|
this.makeToast('{% trans 'Error' %}', '{% trans 'There was an error loading a resource!' %}' + err.bodyText, 'danger')
|
||||||
@ -463,11 +465,15 @@
|
|||||||
"entries": [],
|
"entries": [],
|
||||||
"entries_display": [],
|
"entries_display": [],
|
||||||
"shared": [{% for u in request.user.userpreference.plan_share.all %}
|
"shared": [{% for u in request.user.userpreference.plan_share.all %}
|
||||||
{ 'id': {{ u.pk }}, 'username': '{{ u.get_user_name }}' },
|
{'id': {{ u.pk }}, 'username': '{{ u.get_user_name }}'},
|
||||||
{% endfor %}],
|
{% endfor %}],
|
||||||
"created_by": 1
|
"created_by": 1
|
||||||
}
|
}
|
||||||
this.loading = false
|
this.loading = false
|
||||||
|
|
||||||
|
if (this.shopping_list.entries.length === 0) {
|
||||||
|
this.edit_mode = true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
updateShoppingList: function () {
|
updateShoppingList: function () {
|
||||||
|
Reference in New Issue
Block a user