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

fixed various space related bugs

Browse Source
This commit is contained in:
vabene1111
2021-03-11 16:41:05 +01:00
parent b552badff7
commit 7e38e946a5
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cookbook/forms.py
View File

@ -266,7 +266,7 @@ class SyncForm(forms.ModelForm):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
space = kwargs.pop('space') space = kwargs.pop('space')
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
self.fields['book'].queryset = Storage.objects.filter(space=space).all() self.fields['storage'].queryset = Storage.objects.filter(space=space).all()
class Meta: class Meta:
model = Sync model = Sync

6
cookbook/views/data.py
View File

@ -29,7 +29,7 @@ def sync(request):
if not has_group_permission(request.user, ['admin']): if not has_group_permission(request.user, ['admin']):
messages.add_message(request, messages.ERROR, _('You do not have the required permissions to view this page!')) messages.add_message(request, messages.ERROR, _('You do not have the required permissions to view this page!'))
return HttpResponseRedirect(reverse('data_sync')) return HttpResponseRedirect(reverse('data_sync'))
form = SyncForm(request.POST) form = SyncForm(request.POST, space=request.space)
if form.is_valid(): if form.is_valid():
new_path = Sync() new_path = Sync()
new_path.path = form.cleaned_data['path'] new_path.path = form.cleaned_data['path']
@ -39,9 +39,9 @@ def sync(request):
new_path.save() new_path.save()
return redirect('data_sync') return redirect('data_sync')
else: else:
form = SyncForm() form = SyncForm(space=request.space)
monitored_paths = SyncTable(Sync.objects.fitler(space=request.space).all()) monitored_paths = SyncTable(Sync.objects.filter(space=request.space).all())
RequestConfig(request, paginate={'per_page': 25}).configure(monitored_paths) RequestConfig(request, paginate={'per_page': 25}).configure(monitored_paths)
return render(request, 'batch/monitor.html', {'form': form, 'monitored_paths': monitored_paths}) return render(request, 'batch/monitor.html', {'form': form, 'monitored_paths': monitored_paths})

4
cookbook/views/edit.py
View File

@ -279,7 +279,7 @@ def edit_ingredients(request):
new_unit = units_form.cleaned_data['new_unit'] new_unit = units_form.cleaned_data['new_unit']
old_unit = units_form.cleaned_data['old_unit'] old_unit = units_form.cleaned_data['old_unit']
if new_unit != old_unit: if new_unit != old_unit:
recipe_ingredients = Ingredient.objects.filter(unit=old_unit, space=request.space).all() recipe_ingredients = Ingredient.objects.filter(unit=old_unit, step__recipe__space=request.space).all()
for i in recipe_ingredients: for i in recipe_ingredients:
i.unit = new_unit i.unit = new_unit
i.save() i.save()
@ -295,7 +295,7 @@ def edit_ingredients(request):
new_food = food_form.cleaned_data['new_food'] new_food = food_form.cleaned_data['new_food']
old_food = food_form.cleaned_data['old_food'] old_food = food_form.cleaned_data['old_food']
if new_food != old_food: if new_food != old_food:
ingredients = Ingredient.objects.filter(food=old_food, space=request.space).all() ingredients = Ingredient.objects.filter(food=old_food, step__recipe__space=request.space).all()
for i in ingredients: for i in ingredients:
i.food = new_food i.food = new_food
i.save() i.save()

1
cookbook/views/new.py
View File

@ -103,6 +103,7 @@ def create_new_external_recipe(request, import_id):
recipe.save() recipe.save()
if form.cleaned_data['keywords']:
recipe.keywords.set(form.cleaned_data['keywords']) recipe.keywords.set(form.cleaned_data['keywords'])
new_recipe.delete() new_recipe.delete()