Hopiu/django-modeltranslation
1
0
Fork 0
mirror of https://github.com/Hopiu/django-modeltranslation.git synced 2026-05-09 05:44:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #513 from azum-system/master

Browse source 
Fixed 'formfield_for_dbfield' method signature. See #510
This commit is contained in:
partizan 2019-07-02 19:44:37 +03:00 committed by GitHub
commit 91d5453509
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
modeltranslation/admin.py
View file

@ -35,12 +35,14 @@ class TranslationBaseModelAdmin(BaseModelAdmin):
return [(None, {'fields': self.replace_orig_field(self.get_fields(request, obj))})]
return None
def formfield_for_dbfield(self, db_field, **kwargs):
field = super(TranslationBaseModelAdmin, self).formfield_for_dbfield(db_field, **kwargs)
self.patch_translation_field(db_field, field, **kwargs)
def formfield_for_dbfield(self, db_field, request, **kwargs):
field = super(TranslationBaseModelAdmin, self).formfield_for_dbfield(
db_field, request, **kwargs
)
self.patch_translation_field(db_field, field, request, **kwargs)
return field
def patch_translation_field(self, db_field, field, **kwargs):
def patch_translation_field(self, db_field, field, request, **kwargs):
if db_field.name in self.trans_opts.fields:
if field.required:
field.required = False
@ -54,7 +56,9 @@ class TranslationBaseModelAdmin(BaseModelAdmin):
except AttributeError:
pass
else:
orig_formfield = self.formfield_for_dbfield(orig_field, **kwargs)
orig_formfield = self.formfield_for_dbfield(
orig_field, request, **kwargs
)
field.widget = deepcopy(orig_formfield.widget)
# if any widget attrs are defined on the form they should be copied
try:

31
modeltranslation/tests/tests.py
View file

@ -15,7 +15,7 @@ from django.core.files.base import ContentFile
from django.core.files.storage import default_storage
from django.core.management import call_command
from django.db import IntegrityError
from django.db.models import Q, F, Count
from django.db.models import Q, F, Count, TextField
from django.test import TestCase, TransactionTestCase
from django.test.utils import override_settings
from django.utils import six
@ -2182,6 +2182,35 @@ class TranslationAdminTest(ModeltranslationTestBase):
ma.get_form(request, self.test_obj).base_fields.get(field).widget.attrs.values()
)
def test_widget_ordering_via_formfield_for_dbfield(self):
class TestModelAdmin(admin.TranslationAdmin):
fields = ['text']
def formfield_for_dbfield(self, db_field, request, **kwargs):
if isinstance(db_field, TextField):
kwargs["widget"] = forms.Textarea(attrs={'myprop': 'myval'})
return db_field.formfield(**kwargs)
return super(TestModelAdmin, self).formfield_for_dbfield(
db_field, request, **kwargs
)
ma = TestModelAdmin(models.TestModel, self.site)
fields = ['text_de', 'text_en']
self.assertEqual(
tuple(ma.get_form(request).base_fields.keys()), tuple(fields))
self.assertEqual(
tuple(ma.get_form(request, self.test_obj).base_fields.keys()), tuple(fields))
for field in fields:
self.assertIn(
'myprop',
ma.get_form(request).base_fields.get(field).widget.attrs.keys()
)
self.assertIn(
'myval',
ma.get_form(request, self.test_obj).base_fields.get(field).widget.attrs.values()
)
def test_inline_fieldsets(self):
class DataInline(admin.TranslationStackedInline):
model = models.DataModel