fixup! Add forms for adding recipes and versions
rename to author
This commit is contained in:
parent
38b7d20f29
commit
c0a8ba031f
|
|
@ -6,7 +6,7 @@ class VersionForm(ModelForm):
|
|||
|
||||
class Meta:
|
||||
model = Version
|
||||
fields = ['label', 'slug', 'body', 'alternative_author']
|
||||
fields = ['label', 'slug', 'body', 'author']
|
||||
|
||||
def clean_slug(self):
|
||||
recipe = Recipe.objects.get(id=self.recipe_id)
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ class Version(models.Model):
|
|||
slug = models.SlugField(max_length=20, default='original')
|
||||
body = models.TextField(null=True, blank=True)
|
||||
user = models.ForeignKey(User, on_delete=models.SET_NULL, null=True, blank=True)
|
||||
alternative_author = models.CharField(max_length=30, blank=True)
|
||||
author = models.CharField(max_length=30, blank=True)
|
||||
recipe = models.ForeignKey(Recipe, on_delete=models.PROTECT, null=False, blank=False, related_name='versions')
|
||||
|
||||
def __str__(self) -> str:
|
||||
|
|
|
|||
|
|
@ -53,8 +53,8 @@ def add_version(request, slug_recipe):
|
|||
version = version_form.save(commit=False)
|
||||
version.user = request.user
|
||||
|
||||
if 'alternative_author' in version_form.cleaned_data:
|
||||
version.alternative_author = version_form.cleaned_data['alternative_author']
|
||||
if 'author' in version_form.cleaned_data:
|
||||
version.author = version_form.cleaned_data['author']
|
||||
|
||||
version.recipe = recipe
|
||||
version.save()
|
||||
|
|
@ -73,6 +73,7 @@ def add_version(request, slug_recipe):
|
|||
else:
|
||||
initial = {}
|
||||
version_form = VersionForm(prefix=VERSION_FORM_PREFIX, initial=initial)
|
||||
version_form.fields['author'].widget.attrs['placeholder'] = request.user.first_name if request.user.first_name else request.user.username
|
||||
ingredients_formset = IngredientFormSet(prefix=INGREDIENTS_FORMSET_PREFIX)
|
||||
|
||||
return render(request, 'add-version.html', {'version_form': version_form, 'ingredients_formset': ingredients_formset})
|
||||
|
|
|
|||
Loading…
Reference in a new issue