removed reliance on built-in django ModelForms from templates/core/base.html, apps.dashboard.forms, .tests.test_forms & .test_views
This commit is contained in:
@@ -5,40 +5,28 @@ from .models import Item
|
||||
DUPLICATE_ITEM_ERROR = "You've already logged this to your list"
|
||||
EMPTY_ITEM_ERROR = "You can't have an empty list item"
|
||||
|
||||
class ItemForm(forms.models.ModelForm):
|
||||
class Meta:
|
||||
model = Item
|
||||
fields = ("text",)
|
||||
widgets = {
|
||||
"text": forms.widgets.TextInput(
|
||||
attrs={
|
||||
"placeholder": "Enter a to-do item",
|
||||
"class": "form-control form-control-lg",
|
||||
}
|
||||
),
|
||||
}
|
||||
error_messages = {"text": {"required": EMPTY_ITEM_ERROR}}
|
||||
class ItemForm(forms.Form):
|
||||
text = forms.CharField(
|
||||
error_messages = {"required": EMPTY_ITEM_ERROR},
|
||||
required=True,
|
||||
)
|
||||
|
||||
def is_valid(self):
|
||||
result = super().is_valid()
|
||||
if not result:
|
||||
self.fields["text"].widget.attrs["class"] += " is-invalid"
|
||||
return result
|
||||
|
||||
def save(self, for_list):
|
||||
self.instance.list = for_list
|
||||
return super().save()
|
||||
return Item.objects.create(
|
||||
list=for_list,
|
||||
text=self.cleaned_data["text"],
|
||||
)
|
||||
|
||||
class ExistingListItemForm(ItemForm):
|
||||
def __init__(self, for_list, *args, **kwargs):
|
||||
super().__init__(*args, **kwargs)
|
||||
self.instance.list = for_list
|
||||
self._for_list = for_list
|
||||
|
||||
def clean_text(self):
|
||||
text = self.cleaned_data["text"]
|
||||
if self.instance.list.item_set.filter(text=text).exists():
|
||||
if self._for_list.item_set.filter(text=text).exists():
|
||||
raise forms.ValidationError(DUPLICATE_ITEM_ERROR)
|
||||
return text
|
||||
|
||||
def save(self):
|
||||
return forms.models.ModelForm.save(self)
|
||||
return super().save(for_list=self._for_list)
|
||||
|
||||
Reference in New Issue
Block a user