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

removed user servings feature

Browse Source
This commit is contained in:
vabene1111 2022-07-12 19:43:11 +02:00
parent 5de7fa9d48
commit 8bb7ce2062
3 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cookbook/templates/recipe_view.html
View File

@ -64,7 +64,6 @@
window.CUSTOM_LOCALE = '{{ request.LANGUAGE_CODE }}' window.CUSTOM_LOCALE = '{{ request.LANGUAGE_CODE }}'
window.RECIPE_ID = {{recipe.pk}}; window.RECIPE_ID = {{recipe.pk}};
window.USER_SERVINGS = {{ user_servings }};
window.SHARE_UID = '{{ share }}'; window.SHARE_UID = '{{ share }}';
window.USER_PREF = { window.USER_PREF = {
'use_fractions': {% if request.user.userpreference.use_fractions %} true {% else %} false {% endif %}, 'use_fractions': {% if request.user.userpreference.use_fractions %} true {% else %} false {% endif %},

15
cookbook/views/views.py
View File

@ -190,18 +190,6 @@ def recipe_view(request, pk, share=None):
comment_form = CommentForm() comment_form = CommentForm()
user_servings = None
if request.user.is_authenticated:
user_servings = CookLog.objects.filter(
recipe=recipe,
created_by=request.user,
servings__gt=0,
space=request.space,
).all().aggregate(Avg('servings'))['servings__avg']
if not user_servings:
user_servings = 0
if request.user.is_authenticated: if request.user.is_authenticated:
if not ViewLog.objects.filter(recipe=recipe, created_by=request.user, if not ViewLog.objects.filter(recipe=recipe, created_by=request.user,
created_at__gt=(timezone.now() - timezone.timedelta(minutes=5)), created_at__gt=(timezone.now() - timezone.timedelta(minutes=5)),
@ -209,8 +197,7 @@ def recipe_view(request, pk, share=None):
ViewLog.objects.create(recipe=recipe, created_by=request.user, space=request.space) ViewLog.objects.create(recipe=recipe, created_by=request.user, space=request.space)
return render(request, 'recipe_view.html', return render(request, 'recipe_view.html',
{'recipe': recipe, 'comments': comments, 'comment_form': comment_form, 'share': share, {'recipe': recipe, 'comments': comments, 'comment_form': comment_form, 'share': share,})
'user_servings': user_servings})
@group_required('user') @group_required('user')

4
vue/src/apps/RecipeView/RecipeView.vue
View File

@ -269,10 +269,6 @@ export default {
}, },
loadRecipe: function (recipe_id) { loadRecipe: function (recipe_id) {
apiLoadRecipe(recipe_id).then((recipe) => { apiLoadRecipe(recipe_id).then((recipe) => {
if (window.USER_SERVINGS !== 0) {
recipe.servings = window.USER_SERVINGS
}
let total_time = 0 let total_time = 0
for (let step of recipe.steps) { for (let step of recipe.steps) {
for (let ingredient of step.ingredients) { for (let ingredient of step.ingredients) {