mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-21 00:25:50 +00:00
Remove patches that were incorportated upstream.
This commit is contained in:
parent
6dbefd869c
commit
5425147bad
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=354939
@ -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
|
||||
|
@ -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
|
Loading…
Reference in New Issue
Block a user