Commit Graph

809 Commits (49c2abf70d33332f1b26c3bb27659f0fe48796d0)

Author SHA1 Message Date
Diederik van der Boor 3d9587acfb
Merge PR #353 2019-07-12 09:45:21 +02:00
Diederik van der Boor 4f89a879c0
Add tests for missing content types 2019-07-12 09:43:11 +02:00
Diederik van der Boor ec3fb34f08
Merge pull request #365 from ghost/fix/37-subclass-selector-on-abstract-proxy-models
#37: Fix model subclass ___ selector for abstract/proxy models
2019-07-11 22:12:24 +02:00
Diederik van der Boor 25f4dbb9cd
Restore single if-statement of PR #369 change 2019-07-11 22:10:42 +02:00
Diederik van der Boor a1c779a295
Merge pull request #369 from marksweb/fix/202
Raise `PolymorphicTypeInvalid` instead of cause `TypeError`
2019-07-11 22:09:14 +02:00
Diederik van der Boor 02a7530e83
Merge pull request #370 from ShaheedHaque/srh_issue_367_update_extra_views
Restore compatibility with current versions of extra-views (issue #367).
2019-07-11 22:04:58 +02:00
Diederik van der Boor f9492a12a8
Merge pull request #371 from tumb1er/replace_iterable_class
replace iterable class in qs.non_polymorphic
2019-07-11 22:03:07 +02:00
gtors f06a02a3d0 Issue #373 : Fix bug with get_real_instances on empty base_result_objects 2019-07-11 21:59:46 +02:00
Diederik van der Boor 26fac56e31
Squash Merge PR #379 for Django 2.2 support
Author: Asif Saif Uddin <auvipy@gmail.com>
Author: jeff <jeff@mighty.com>
2019-07-11 21:57:46 +02:00
Andrey Zelenchuk 11208cedf8 Fix bug #392 "Inline model admin: wrong hiding of add button" 2019-07-11 21:42:24 +02:00
Diederik van der Boor 622e1e780b
Fix media-combining in formsets on Django 2.2 2019-07-11 21:38:33 +02:00
Diederik van der Boor 0f9dbe05b0
Run tests on Django 2.2 2019-07-11 21:35:43 +02:00
Diederik van der Boor 41fd1fba37
Fix SQLite3 build errors on travis 2019-07-11 21:22:52 +02:00
tumb1er c565ae101a replace iterable class in qs.non_polymorphic 2018-11-28 17:23:00 +03:00
Shaheed Haque 26b0eefa3a Restore compatibility with current versions of extra-views (issue #367). 2018-11-24 12:49:26 +00:00
Mark Walker 3d9ac45cec Correct the docstring for the invalid test. 2018-11-22 20:12:48 +00:00
Mark Walker fd9d0fa2b8 Raise exception instead of cause `TypeError` when `polymorphic_ctype_id` is invalid. 2018-11-22 20:05:57 +00:00
Lukasz Zdun 14b31bed4c #37: Fix model subclass ___ selector for abstract/proxy models 2018-09-29 09:16:16 +02:00
Damian Mastylo 6d27bb3334 Fix typo in admin.rst 2018-09-19 13:42:25 +02:00
Diederik van der Boor 9042fdd689
Replace instance_of OR query with IN statement 2018-08-24 11:16:30 +02:00
Diederik van der Boor 3d014a482c
remove python 3.7 from travis builds as this is not supported yet 2018-08-24 00:13:39 +02:00
Diederik van der Boor 545bf7d49d
Bump to v2.0.3 for Django 2.1 support 2018-08-24 00:09:21 +02:00
Diederik van der Boor 9a0268f7de
Fixed example app to run in Django 2.1 2018-08-24 00:06:20 +02:00
Diederik van der Boor b95e621ab1
fix travis 2018-08-23 17:24:18 +02:00
Diederik van der Boor 2d5603c74d
Add Python 3.7 to the build matrix 2018-08-23 17:21:19 +02:00
Diederik van der Boor 2d1ad3f773
Add Django 2.1 to the build matrix 2018-08-23 17:18:51 +02:00
Diederik van der Boor 374afc3eac
Fixed Django 2.1 error due to missing use_required_attribute=False for empty forms
This attribute is supported as of Django 1.10, so adding it without
conditional Django version checks.

Fixes #360
2018-08-23 17:18:43 +02:00
Diederik van der Boor 5f50aa1dca
fix test warnings about \d+ escape 2018-08-23 14:24:32 +02:00
Markus Grimm 0f6352d74d Added test 2018-08-09 09:13:48 +02:00
Markus Grimm 6040e9891a Fix prefetch_related behavior 2018-06-28 15:10:43 +02:00
Diederik van der Boor 63c33d595a Further highlight the differences between 1.3.1 and 2.0 2018-04-16 11:56:51 +02:00
Diederik van der Boor 78e31f16e7 Reinserted v1.3.1 changelog after merging with "ours" strategy 2018-04-16 11:37:47 +02:00
Diederik van der Boor a797605853 Merge branch 'v1.3.x' 2018-04-16 11:36:38 +02:00
Diederik van der Boor 31dd8b6138 Release v1.3.1 2018-04-16 11:33:14 +02:00
Diederik van der Boor 8f7f255580 Fixed template settings in example app
(cherry picked from commit 19497960c7)
2018-04-16 11:33:08 +02:00
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