Briq
/
django-polymorphic
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
623 Commits
1 Branch
0 Tags
1.4 MiB
Commit Graph

354 Commits (8f7f255580a4e54b72a450a42d2fdabe48dd591a)

Author SHA1 Message Date
Tadas Dailyda 5fe504d40d fix detecting whether childadmin has explicitly defined fields/fieldsets 
(cherry picked from commit 180df8e98c)
 2018-04-16 11:21:51 +02:00
Tadas Dailyda d1c5845966 further childadmin fieldsets improvements 
(cherry picked from commit 15426dc695)
 2018-04-16 11:21:51 +02:00
Diederik van der Boor 9f92b0614d Fixed applabel__ModelName___field looksups 
Closes: #286
(cherry picked from commit 8f0932b71e)
 2018-04-16 11:21:51 +02:00
Diederik van der Boor ca1a982c34 Make sure reset_polymorphic_ctype() supports proxy models 
(cherry picked from commit 04b5fb423c)
 2018-04-16 11:21:51 +02:00
Diederik van der Boor 551e93c47c Fix support for proxy models in formsets and admin inlines 
(cherry picked from commit c2768f8101)
 2018-04-16 11:21:51 +02:00
Diederik van der Boor 5c0b561ba2 Add UnsupportedChildType error for formsets 
This also replaces the PolymorphicInlineModelAdmin.get_get_child_inline_instance()
and BasePolymorphicModelFormSet._construct_form() lookup with UnsupportedChildType

(cherry picked from commit cafaf95f06)
 2018-04-16 11:21:51 +02:00
Diederik van der Boor e00e6d7e39 Fix deleteText of |as_script_options 
(cherry picked from commit 9f6e0716f6)
 2018-04-16 11:21:51 +02:00
Diederik van der Boor 7de1366f6f Improve docs of PolymorphicChildModelAdmin attributes 
(cherry picked from commit c437524876)
 2018-04-16 11:21:51 +02:00
Diederik van der Boor fe7de17ecf Make the admin `base_model` setting optional. 
It can be detected using get_base_polymorphic_model()

(cherry picked from commit cf0cb2478f)
 2018-04-16 11:21:51 +02:00
Diederik van der Boor 874b60ec40 Added `get_base_polymorphic_model()` to detect the common base class for a polymorphic model. 
(cherry picked from commit 04d4181e17)
 2018-04-16 11:21:51 +02:00
Diederik van der Boor fa9612d49c Small Django 1.8/19 difference for .only() 2018-04-16 11:21:39 +02:00
trbs 1c110ae4bb fix error with .defer and child models that use the same parent 
When using .defer on a PolymorphicQuerySet with multiple childs that
subclass from the same polymorphic parent model yield an error like:

>>> Base.objects.defer('ModelY___field_y')
Traceback (most recent call last):
...
FieldDoesNotExist: ModelX has no field named 'field_y'

(cherry picked from commit 9500a21f82)
 2018-04-16 11:08:27 +02:00
Diederik van der Boor 171df51428 Ensure consistent ordering in testing reset_polymorphic_ctype 
Amends: 171d14f369
(cherry picked from commit 77797bfa12)
 2018-04-16 11:08:27 +02:00
Diederik van der Boor 467e6f517e Improve reset_polymorphic_ctype() for reliability and test it. 
This function can now be safely used on a set of models.

(cherry picked from commit 171d14f369)
 2018-04-16 11:08:27 +02:00
Diederik van der Boor db46dbb446 Also introduce a new exception type for invalid database IDs 
(cherry picked from commit 4835cd244e)
 2018-04-16 11:08:27 +02:00
Diederik van der Boor f126f5f304 Provide a better error message when polymorphic_ctype_id is Null 
refs #51, #140, #304

(cherry picked from commit fb8eed78ad)
 2018-04-16 11:08:27 +02:00
Krzysztof Nazarewski 925c4de34f `declared_fieldsets` typo fix 
(cherry picked from commit 697df65c7b)
 2018-04-16 11:08:27 +02:00
Tadas Dailyda 731fd51a67 skip manager validation on swapped models 2018-04-16 10:42:01 +02:00
Tadas Dailyda 6013de93d3 tests for abstract/swappable model initialization 
(cherry picked from commit 0fea8a4d92)
 2018-04-16 10:41:50 +02:00
Diederik van der Boor 1ce58a0b54 Bump to v1.3 - note: support for old Django versions dropped! 2017-08-01 11:07:24 +02:00
Diederik van der Boor 67dd5c0a0d Reverted int/long change, as Django's BigIntegerField can produce longs on Python 2 2017-07-10 10:57:07 +02:00
Jerome Leclanche 87979a6660 Remove outdated 404 url from docstrings 2017-07-10 09:08:11 +03:00
Jerome Leclanche 0a495cb485 Fix PolymorphicParentModelAdmin.pk_regex escape 2017-07-10 09:08:11 +03:00
Jerome Leclanche 1e7237986c Specify on_delete argument for all related fields that need it 2017-07-10 09:08:11 +03:00
Jerome Leclanche 298460c4cf Drop support for Django <1.8, Python <2.7 2017-07-10 09:08:11 +03:00
Diederik van der Boor b4b020bf2d Merge pull request #293 from NeveHanter/fix-po-files 
Fixed PO files which resulted in SyntaxError when parsed by polib
 2017-06-20 12:07:30 +02:00
Jerome Leclanche 544f5edef4 Fix accessor replacement consistency on Django 1.11 
At this point, we don't know why this line of code is executed, but
we do know it's not consistently executed between Django 1.10 and
Django 1.11 due to the addition of `ForwardOneToOneDescriptor`, a
subclass of `ForwardManyToOneDescriptor`.

Refs. 6628145af7
Refs. kavdev/dj-stripe#524
Refs. django/django@38575b007a
 2017-06-07 13:27:50 +03:00
Kamil Bar 2ece6ba582 Fixed PO files which resulted in SyntaxError when parsed by polib 2017-06-05 12:55:20 +02:00
Diederik van der Boor bcb8b0d3a4 Allow .order_by() to pass expressions unchanged 
Fixes: #257
 2017-05-22 12:53:20 +02:00
Charlie Denton 6f733d7471
Fix minor typo 2017-05-07 22:19:50 +01:00
Diederik van der Boor 44d79b5a19 Fixed Python 2.6 support in test code 2017-05-01 12:45:43 +02:00
Diederik van der Boor 21d41100df Bump to v1.2 for Django 1.11 support 2017-05-01 12:35:47 +02:00
Diederik van der Boor 9c618d8b21 Improve tests to use a unified qrepr() output 2017-05-01 12:34:49 +02:00
Diederik van der Boor 61b398115b Fixed queryset processing for real (another merge fix for pr #279) 2017-04-26 16:44:54 +02:00
Diederik van der Boor 09d785f5bb Fix infinite recursion on github editing of pr #279 
Fixes: 89632483a7
 2017-04-26 16:38:26 +02:00
Diederik van der Boor 89632483a7 Merge branch 'master' into dj111-fix 2017-04-26 15:53:59 +02:00
un.def 78d3cd4945 Fix regression with Django < 1.9 2017-04-19 14:43:51 +03:00
un.def dbad7bd40d Migrate from unused in Django 1.11 qs.iterator() to custom qs._iterable_class 2017-04-19 12:56:04 +03:00
Charlie Denton f010c6ddf7
Get tests running on django 1.11 
I'm a little concerned that this loses some of the efficiencies (in
particular, chunking) from previous versions. That's something that can
probably be improved.
 2017-04-12 23:52:06 +01:00
Diederik van der Boor a568c04e40 Merge pull request #262 from pawelad/patch-1 
Added 'z-index' attribute to '.polymorphic-type-menu' CSS class
 2017-04-06 14:15:45 +02:00
Diederik van der Boor a8bfb5007e Fix TypeError on Python 3 when querystring is preserved in the admin. 
Fixes: #263
 2017-04-06 14:13:56 +02:00
Diederik van der Boor a3c9bcb14a Merge remote branch 'meshy/new-test-versions' 2017-04-06 13:57:07 +02:00
Diederik van der Boor d8cb700e58 Make sure tests can run in Django 1.11 2017-04-06 12:51:16 +02:00
Diederik van der Boor cd38e785b2 Add an explicit exclude for polymorphic_ctype in the PolymorphicInlineModelAdmin 2017-04-06 12:47:28 +02:00
Charlie Denton aefb7dabc2
Django 1.11 uses real class names in __repr__() 
See https://code.djangoproject.com/ticket/27546 and
https://github.com/django/django/commit/48826aa
 2017-03-03 22:56:09 +00:00
Charlie Denton 8e52bdf6d1
Explicitly name ids of clashing base models 
This avoids the following error in django 1.11 tests:

    polymorphic.MRODerived: (models.E005) The field 'id' from parent model 'polymorphic.mrobase3' clashes with the field 'id' from parent model 'polymorphic.mrobase1'.

Related to https://code.djangoproject.com/ticket/22442
 2017-03-03 22:16:54 +00:00
Paweł Adamczak 54b681c13b Added 'z-index' attribute to '.polymorphic-type-menu' CSS class 2017-02-06 15:06:58 +00:00
Diederik van der Boor 132e2cfdf9 Bump to v1.1 2017-02-03 22:08:48 +01:00
Diederik van der Boor 7dc2f93148 Added plain tests for admin importing 2017-02-03 22:05:13 +01:00
Diederik van der Boor b691533039 Fix import errors with Django 1.6 code 2017-02-03 22:05:13 +01:00