From: Thomas Goirand Date: Wed, 20 Jul 2016 16:51:01 +0000 (+0000) Subject: Add django-1.10-fixes-get-form-uses-kwargs.patch X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=fe6f7c09a08dd7271a6573853b619edc47fbf042;p=openstack-build%2Fhorizon-build.git Add django-1.10-fixes-get-form-uses-kwargs.patch Rewritten-From: 1a6558a8c0d3c6cb167fbfa67d66f4420b5513aa --- diff --git a/xenial/debian/changelog b/xenial/debian/changelog index 2037c75..0d8d4c0 100644 --- a/xenial/debian/changelog +++ b/xenial/debian/changelog @@ -4,6 +4,7 @@ horizon (3:10.0.0~b2-2) UNRELEASED; urgency=medium - django-1.10-django.conf.urls.patterns-removed.patch - django-1.10-define-TEMPLATES.patch - django-1.10-fix-wrong-django.conf.urls.url-call.patch + - django-1.10-fixes-get-form-uses-kwargs.patch -- Thomas Goirand Wed, 20 Jul 2016 10:49:45 +0200 diff --git a/xenial/debian/patches/django-1.10-fixes-get-form-uses-kwargs.patch b/xenial/debian/patches/django-1.10-fixes-get-form-uses-kwargs.patch new file mode 100644 index 0000000..f0c0ccc --- /dev/null +++ b/xenial/debian/patches/django-1.10-fixes-get-form-uses-kwargs.patch @@ -0,0 +1,20 @@ +Description: Fixes get_form() uses kwargs + In Django 1.10, get_from() needs to use kwargs instead of a normal param. +Author: Thomas Goirand +Forwarded: no +Last-Update: 2016-07-20 + +--- horizon-10.0.0~b2.orig/horizon/forms/views.py ++++ horizon-10.0.0~b2/horizon/forms/views.py +@@ -165,8 +165,10 @@ class ModalFormView(ModalFormMixin, view + """ + return obj.name + +- def get_form(self, form_class): ++ def get_form(self, form_class=None): + """Returns an instance of the form to be used in this view.""" ++ if form_class is None: ++ form_class = self.get_form_class() + return form_class(self.request, **self.get_form_kwargs()) + + def form_invalid(self, form): diff --git a/xenial/debian/patches/series b/xenial/debian/patches/series index 9230276..2bfcd3e 100644 --- a/xenial/debian/patches/series +++ b/xenial/debian/patches/series @@ -5,3 +5,4 @@ BaseCommand.option_list-is-gone-from-django1.10.patch django-1.10-django.conf.urls.patterns-removed.patch django-1.10-fix-wrong-django.conf.urls.url-call.patch django-1.10-define-TEMPLATES.patch +django-1.10-fixes-get-form-uses-kwargs.patch