diff options
author | jpaetzel <jpaetzel@FreeBSD.org> | 2014-05-23 23:36:37 +0800 |
---|---|---|
committer | jpaetzel <jpaetzel@FreeBSD.org> | 2014-05-23 23:36:37 +0800 |
commit | 25ac55524805f81c0d5560d657aece1da3a5da7a (patch) | |
tree | 11ad9f7cdbbaf1ceb92dffb27c687c63c13e64f2 /www | |
parent | 0334af52e06239840f2ae437f8568bef325ca499 (diff) | |
download | freebsd-ports-gnome-25ac55524805f81c0d5560d657aece1da3a5da7a.tar.gz freebsd-ports-gnome-25ac55524805f81c0d5560d657aece1da3a5da7a.tar.zst freebsd-ports-gnome-25ac55524805f81c0d5560d657aece1da3a5da7a.zip |
Remove patches that were incorportated upstream.
Diffstat (limited to 'www')
-rw-r--r-- | www/py-dojango/files/patch-dojango-forms-fields.py | 17 | ||||
-rw-r--r-- | www/py-dojango/files/patch-dojango-forms-models.py | 46 |
2 files changed, 0 insertions, 63 deletions
diff --git a/www/py-dojango/files/patch-dojango-forms-fields.py b/www/py-dojango/files/patch-dojango-forms-fields.py deleted file mode 100644 index b0382c684126..000000000000 --- a/www/py-dojango/files/patch-dojango-forms-fields.py +++ /dev/null @@ -1,17 +0,0 @@ ---- dojango/forms/fields.py.orig 2013-12-31 14:27:55.320053693 +0000 -+++ dojango/forms/fields.py 2013-12-31 14:28:29.718050373 +0000 -@@ -61,9 +61,13 @@ - widget = widgets.Select - - class IntegerField(DojoFieldMixin, fields.IntegerField): -- widget = widgets.NumberTextInput - decimal_places = 0 - -+ def __init__(self, *args, **kwargs): -+ if 'widget' not in kwargs: -+ kwargs['widget'] = widgets.NumberTextInput -+ super(IntegerField, self).__init__(*args, **kwargs) -+ - class BooleanField(DojoFieldMixin, fields.BooleanField): - widget = widgets.CheckboxInput - diff --git a/www/py-dojango/files/patch-dojango-forms-models.py b/www/py-dojango/files/patch-dojango-forms-models.py deleted file mode 100644 index 885a4705494d..000000000000 --- a/www/py-dojango/files/patch-dojango-forms-models.py +++ /dev/null @@ -1,46 +0,0 @@ ---- dojango/forms/models.py.orig 2013-12-19 05:09:15.062402990 -0800 -+++ dojango/forms/models.py 2013-12-19 05:11:27.052422916 -0800 -@@ -2,7 +2,7 @@ - from django.forms.models import BaseModelFormSet - from django.forms.models import BaseInlineFormSet - from django.forms.models import ModelChoiceIterator --from django.forms.models import InlineForeignKeyHiddenInput, InlineForeignKeyField -+from django.forms.models import InlineForeignKeyField - - from django.utils.text import capfirst - -@@ -32,32 +32,12 @@ - - # Fields ##################################################################### - --class InlineForeignKeyHiddenInput(DojoWidgetMixin, InlineForeignKeyHiddenInput): -- """ -- Overwritten InlineForeignKeyHiddenInput to use the dojango widget mixin -- """ -- dojo_type = 'dijit.form.TextBox' # otherwise dijit.form.Form can't get its values -- - class InlineForeignKeyField(DojoFieldMixin, InlineForeignKeyField, Field): - """ -- Overwritten InlineForeignKeyField to use the dojango field mixin and passing -+ Overwritten InlineForeignKeyField to use the dojango HiddenInput - the dojango InlineForeignKeyHiddenInput as widget. - """ -- def __init__(self, parent_instance, *args, **kwargs): -- self.parent_instance = parent_instance -- self.pk_field = kwargs.pop("pk_field", False) -- self.to_field = kwargs.pop("to_field", None) -- if self.parent_instance is not None: -- if self.to_field: -- kwargs["initial"] = getattr(self.parent_instance, self.to_field) -- else: -- kwargs["initial"] = self.parent_instance.pk -- -- kwargs["required"] = False -- kwargs["widget"] = InlineForeignKeyHiddenInput -- # don't call the the superclass of this one. Use the superclass of the -- # normal django InlineForeignKeyField -- Field.__init__(self, *args, **kwargs) -+ widget = HiddenInput - - # our customized model field => form field map - # here it is defined which form field is used by which model field, when creating a ModelForm |