Skip to content

Commit

Permalink
Merge pull request #5992 from vxsx/bugfix/slugs-in-wizard-backport-3.4.x
Browse files Browse the repository at this point in the history
Added slug generation to the wizard as well
  • Loading branch information
vxsx committed Jun 20, 2017
2 parents 85f3da1 + 5ac8729 commit 70b21fe
Show file tree
Hide file tree
Showing 20 changed files with 315 additions and 250 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
=== 3.4.5 (unreleased) ===

* Fixed a bug where slug wouldn't be generated in the creation wizard


=== 3.4.4 (unreleased) ===

* Fixed a bug in which cancelling the publishing dialog wasn't respected.
Expand Down
14 changes: 13 additions & 1 deletion cms/forms/wizards.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
user_can_add_subpage,
)
from cms.utils.conf import get_cms_setting
from cms.utils.urlutils import static_with_version

try:
# djangocms_text_ckeditor is not guaranteed to be available
Expand All @@ -41,6 +42,16 @@ class Media:
'cms/js/widgets/wizard.pagetypeselect.js',
)

class SlugWidget(forms.widgets.TextInput):
"""
Special widget for the slug field that requires Title field to be there.
Adds the js for the slugifying.
"""
class Media:
js = (
'admin/js/urlify.js',
static_with_version('cms/js/dist/bundle.forms.slugwidget.min.js'),
)

class BaseCMSPageForm(forms.Form):
page = None
Expand All @@ -50,7 +61,8 @@ class BaseCMSPageForm(forms.Form):
help_text=_(u"Provide a title for the new page."))
slug = forms.SlugField(
label=_(u'Slug'), max_length=255, required=False,
help_text=_(u"Leave empty for automatic slug, or override as required.")
help_text=_(u"Leave empty for automatic slug, or override as required."),
widget=SlugWidget()
)
page_type = forms.ChoiceField(
label=_(u'Page type'), required=False, widget=PageTypeSelect())
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions cms/static/cms/js/dist/3.4.3/bundle.toolbar.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion cms/static/cms/js/dist/3.4.4/bundle.admin.base.min.js

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions cms/static/cms/js/dist/3.4.4/bundle.admin.pagetree.min.js

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions cms/static/cms/js/dist/3.4.4/bundle.admin.widget.min.js

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions cms/static/cms/js/dist/3.4.4/bundle.toolbar.min.js

Large diffs are not rendered by default.

Loading

0 comments on commit 70b21fe

Please sign in to comment.