Self hosted FLOSS fitness/workout, nutrition and weight tracker
Move MealItemForm to forms file
Roland Geider85436cb47311
diff --git a/wger/nutrition/forms.py b/wger/nutrition/forms.pyindex 545513155..c7f6b40d6 100644--- a/wger/nutrition/forms.py+++ b/wger/nutrition/forms.py@@ -20,7 +20,7 @@ from django import formsfrom django.utils.translation import ugettext as _from wger.core.models import UserProfile-from wger.nutrition.models import IngredientWeightUnit+from wger.nutrition.models import IngredientWeightUnit, Ingredient, MealItemfrom wger.utils.widgets import Html5NumberInput@@ -110,3 +110,32 @@ class DailyCaloriesForm(forms.ModelForm):class Meta:model = UserProfilefields = ('calories',)+++class MealItemForm(forms.ModelForm):+ weight_unit = forms.ModelChoiceField(queryset=IngredientWeightUnit.objects.none(),+ empty_label="g",+ required=False)+ ingredient = forms.ModelChoiceField(queryset=Ingredient.objects.all(),+ widget=forms.HiddenInput)++ class Meta:+ model = MealItem+ exclude = []++ def __init__(self, *args, **kwargs):+ super(MealItemForm, self).__init__(*args, **kwargs)++ # Get the ingredient_id+ ingredient_id = None++ if kwargs.get('instance'):+ ingredient_id = kwargs['instance'].ingredient_id++ if kwargs.get('data'):+ ingredient_id = kwargs['data']['ingredient']++ # Filter the available ingredients+ if ingredient_id:+ self.fields['weight_unit'].queryset = \+ IngredientWeightUnit.objects.filter(ingredient_id=ingredient_id)diff --git a/wger/nutrition/views/meal_item.py b/wger/nutrition/views/meal_item.pyindex 41457229c..cb8124408 100644--- a/wger/nutrition/views/meal_item.py+++ b/wger/nutrition/views/meal_item.py@@ -15,60 +15,24 @@# You should have received a copy of the GNU Affero General Public Licenseimport logging-from django import formsfrom django.shortcuts import get_object_or_404from django.http import HttpResponseRedirectfrom django.http import HttpResponseForbiddenfrom django.core.urlresolvers import reversefrom django.contrib.auth.decorators import login_requiredfrom django.utils.translation import ugettext_lazy-from django.views.generic import CreateViewfrom django.views.generic import UpdateView+from wger.nutrition.forms import MealItemFormfrom wger.nutrition.models import Mealfrom wger.nutrition.models import MealItem-from wger.nutrition.models import Ingredient-from wger.nutrition.models import IngredientWeightUnit-from wger.utils.generic_views import WgerFormMixinlogger = logging.getLogger('wger.custom')-# ************************-# Meal ingredient functions-# ************************-class MealItemForm(forms.ModelForm):- weight_unit = forms.ModelChoiceField(queryset=IngredientWeightUnit.objects.none(),- empty_label="g",- required=False)- ingredient = forms.ModelChoiceField(queryset=Ingredient.objects.all(),- widget=forms.HiddenInput)-- class Meta:- model = MealItem- exclude = []-- def __init__(self, *args, **kwargs):- super(MealItemForm, self).__init__(*args, **kwargs)-- # Get the ingredient_id- ingredient_id = None-- if kwargs.get('instance'):- ingredient_id = kwargs['instance'].ingredient_id-- if kwargs.get('data'):- ingredient_id = kwargs['data']['ingredient']-- # Filter the available ingredients- if ingredient_id:- self.fields['weight_unit'].queryset = \- IngredientWeightUnit.objects.filter(ingredient_id=ingredient_id)--@login_requireddef delete_meal_item(request, item_id):'''