From 7a681f94f792c3399865b5f5239fc0d0e21566c6 Mon Sep 17 00:00:00 2001 From: Lukasz Kozlowski Date: Fri, 27 Nov 2015 18:39:41 +0100 Subject: [PATCH] Update tags widget in Image and Douments forms. AdminTagWidget provides initTagField function that fixes issue with multiple-word tags. --- wagtail/wagtaildocs/forms.py | 4 +++- wagtail/wagtailimages/forms.py | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/wagtail/wagtaildocs/forms.py b/wagtail/wagtaildocs/forms.py index 09c551376..90d4a9880 100644 --- a/wagtail/wagtaildocs/forms.py +++ b/wagtail/wagtaildocs/forms.py @@ -1,5 +1,6 @@ from django import forms +from wagtail.wagtailadmin import widgets from wagtail.wagtaildocs.models import Document @@ -10,5 +11,6 @@ class DocumentForm(forms.ModelForm): model = Document fields = ('title', 'file', 'tags') widgets = { - 'file': forms.FileInput() + 'file': forms.FileInput(), + 'tags': widgets.AdminTagWidget, } diff --git a/wagtail/wagtailimages/forms.py b/wagtail/wagtailimages/forms.py index faf1dd703..ec7c8f3c5 100644 --- a/wagtail/wagtailimages/forms.py +++ b/wagtail/wagtailimages/forms.py @@ -2,6 +2,7 @@ from django import forms from django.forms.models import modelform_factory from django.utils.translation import ugettext as _ +from wagtail.wagtailadmin import widgets from wagtail.wagtailimages.formats import get_image_formats from wagtail.wagtailimages.fields import WagtailImageField @@ -16,6 +17,7 @@ def formfield_for_dbfield(db_field, **kwargs): return db_field.formfield(**kwargs) + def get_image_form(model): return modelform_factory( model, @@ -25,6 +27,7 @@ def get_image_form(model): # so that when editing, we don't get the 'currently: ...' banner which is # a bit pointless here widgets={ + 'tags': widgets.AdminTagWidget, 'file': forms.FileInput(), 'focal_point_x': forms.HiddenInput(attrs={'class': 'focal_point_x'}), 'focal_point_y': forms.HiddenInput(attrs={'class': 'focal_point_y'}),