075f457045
Removed unnecessary translation comments ( #316 )
2017-10-07 01:28:34 +03:00
30630647c4
Add extra comment why deferred fields are skipped with ___ lookups
2017-09-30 20:26:52 +02:00
2e16112cbe
Merge branch 'fix-defer-childs-same-polymorphic-parent' into master
2017-09-30 20:26:37 +02:00
fb80233c5d
Fix one Django-master error
2017-09-30 18:57:31 +02:00
fab687c218
Workaround RTD error to generate the API pages
2017-09-30 18:47:03 +02:00
c795c18575
Add admin history, add type, and add page tests
2017-09-30 18:33:19 +02:00
a950049356
Improved and added more admin test cases
2017-09-30 18:16:59 +02:00
8d4cb9b151
Added rudimentary admin test cases
2017-09-30 17:47:02 +02:00
8caac2e57b
Fixed the polymorphic inline script code.
...
Got broken in 0c7b1aa657
2017-09-30 16:50:12 +02:00
9f6e0716f6
Fix deleteText of |as_script_options
2017-09-30 16:46:26 +02:00
c437524876
Improve docs of PolymorphicChildModelAdmin attributes
2017-09-30 16:35:21 +02:00
cf0cb2478f
Make the admin `base_model` setting optional.
...
It can be detected using get_base_polymorphic_model()
2017-09-30 16:35:02 +02:00
04d4181e17
Added `get_base_polymorphic_model()` to detect the common base class for a polymorphic model.
2017-09-30 16:21:21 +02:00
6febf7a069
Merge pull request #303 from WhyNotHugo/pgtests
...
Run CI with postgres too
2017-09-30 15:52:31 +02:00
bc11934c31
allowing extra arguments in get_inline_formsets
2017-09-28 12:22:13 +03:00
e102a0502c
Update a bunch of failing tests
...
Tests were failing because of:
* Models weren't being imported from their new location.
* PolymorphicManager doesn't work with non-polymorphic models, but
migrations run models' manager, so having MROBase3 with
PolymorphicManager failed.
* Some tests failed due to have assertions were being done (since they
hardcoded expected instance ids). Update tests to use comparisons
similar to #312
2017-09-06 20:06:25 -03:00
a507345c6d
Move test models into models.py and add migrations
...
Tests were failing on postgres due to foreign keys pointing to missing
tables.
In order for these tables to be present, we need migrations which
declare depending on `content_type`.
2017-09-06 19:47:18 -03:00
80b4f2bb41
Fix failing tests with django/master
...
Several tests were failing with django master. This is because,
apparently, IDs don't match those expected in tests, and other
test-related details.
Replace all test comparisons with assertQuerysetEqual, which is safer
and cleaner for the sort of comparison we're doing.
2017-09-06 22:41:13 +03:00
9500a21f82
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'
2017-08-30 21:17:05 +02:00
3af5db0ceb
tests: Clean up and simplify test_reset_polymorphic_ctype
2017-08-29 19:41:42 +03:00
a91a04af6b
Set polymorphic.__version__ from setuptools metadata
2017-08-29 19:41:42 +03:00
300e9b062e
Use field.remote_field instead of field.rel
...
Deprecated in Django 1.9, removed in 2.0
More information:
- https://docs.djangoproject.com/en/1.11/releases/1.9/#field-rel-changes
2017-08-29 19:41:42 +03:00
fc8cabfa26
Replace use_for_related_fields by Meta.base_manager_name
...
Deprecated in 1.10, removed in 2.0
More information:
- https://code.djangoproject.com/ticket/14891
- django/django@ed0ff913c6
2017-08-29 19:41:42 +03:00
6fe1e2ddae
Update django.urls imports
2017-08-29 19:41:42 +03:00
4dc20a0213
Remove Pre-1.0 compatibility hacks
2017-08-29 19:41:42 +03:00
0c7b1aa657
Drop support for Django 1.8
2017-08-29 19:41:42 +03:00
77797bfa12
Ensure consistent ordering in testing reset_polymorphic_ctype
...
Amends: 171d14f369
2017-08-01 13:51:42 +02:00
171d14f369
Improve reset_polymorphic_ctype() for reliability and test it.
...
This function can now be safely used on a set of models.
2017-08-01 12:17:10 +02:00
e10deeaebd
Remove test imports that Django 1.5- required
2017-08-01 12:17:10 +02:00
4835cd244e
Also introduce a new exception type for invalid database IDs
2017-08-01 11:44:21 +02:00
fb8eed78ad
Provide a better error message when polymorphic_ctype_id is Null
...
refs #51 , #140 , #304
2017-08-01 11:44:21 +02:00
b772c06358
move contrib tests to separate file
2017-08-01 11:44:21 +02:00
fe0880e413
Merge pull request #300 from nazarewk/patch-1
...
`declared_fieldsets` typo fix
2017-08-01 11:38:13 +02:00
b9ee2c7ab6
Merge pull request #307 from skirsdeda/master
...
Swapped polymorphic models don't work on Django>=1.10
2017-08-01 11:19:37 +02:00
1ce58a0b54
Bump to v1.3 - note: support for old Django versions dropped!
2017-08-01 11:07:24 +02:00
02330a5ec8
skip manager validation on swapped models
2017-07-25 14:11:37 +03:00
0fea8a4d92
tests for abstract/swappable model initialization
2017-07-25 14:02:15 +03:00
67dd5c0a0d
Reverted int/long change, as Django's BigIntegerField can produce longs on Python 2
2017-07-10 10:57:07 +02:00
87979a6660
Remove outdated 404 url from docstrings
2017-07-10 09:08:11 +03:00
0a495cb485
Fix PolymorphicParentModelAdmin.pk_regex escape
2017-07-10 09:08:11 +03:00
1e7237986c
Specify on_delete argument for all related fields that need it
2017-07-10 09:08:11 +03:00
298460c4cf
Drop support for Django <1.8, Python <2.7
2017-07-10 09:08:11 +03:00
697df65c7b
`declared_fieldsets` typo fix
2017-07-05 13:45:28 +02:00
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
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. 6628145af7kavdev/dj-stripe#524
Refs. django/django@38575b007a
2017-06-07 13:27:50 +03:00
2ece6ba582
Fixed PO files which resulted in SyntaxError when parsed by polib
2017-06-05 12:55:20 +02:00
bcb8b0d3a4
Allow .order_by() to pass expressions unchanged
...
Fixes : #257
2017-05-22 12:53:20 +02:00
6f733d7471
Fix minor typo
2017-05-07 22:19:50 +01:00
44d79b5a19
Fixed Python 2.6 support in test code
2017-05-01 12:45:43 +02:00
21d41100df
Bump to v1.2 for Django 1.11 support
2017-05-01 12:35:47 +02:00
9c618d8b21
Improve tests to use a unified qrepr() output
2017-05-01 12:34:49 +02:00
61b398115b
Fixed queryset processing for real (another merge fix for pr #279 )
2017-04-26 16:44:54 +02:00
09d785f5bb
Fix infinite recursion on github editing of pr #279
...
Fixes: 89632483a7
2017-04-26 16:38:26 +02:00
89632483a7
Merge branch 'master' into dj111-fix
2017-04-26 15:53:59 +02:00
78d3cd4945
Fix regression with Django < 1.9
2017-04-19 14:43:51 +03:00
dbad7bd40d
Migrate from unused in Django 1.11 qs.iterator() to custom qs._iterable_class
2017-04-19 12:56:04 +03:00
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
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
a8bfb5007e
Fix TypeError on Python 3 when querystring is preserved in the admin.
...
Fixes : #263
2017-04-06 14:13:56 +02:00
a3c9bcb14a
Merge remote branch 'meshy/new-test-versions'
2017-04-06 13:57:07 +02:00
d8cb700e58
Make sure tests can run in Django 1.11
2017-04-06 12:51:16 +02:00
cd38e785b2
Add an explicit exclude for polymorphic_ctype in the PolymorphicInlineModelAdmin
2017-04-06 12:47:28 +02:00
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
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
54b681c13b
Added 'z-index' attribute to '.polymorphic-type-menu' CSS class
2017-02-06 15:06:58 +00:00
132e2cfdf9
Bump to v1.1
2017-02-03 22:08:48 +01:00
7dc2f93148
Added plain tests for admin importing
2017-02-03 22:05:13 +01:00
b691533039
Fix import errors with Django 1.6 code
2017-02-03 22:05:13 +01:00
66619371fd
remove empty test_models.py file
2017-02-03 22:05:13 +01:00
ed09e4db93
Fixed Python 2.6 issue
2017-02-03 21:44:38 +01:00
d11bb17809
Bump to v1.1b:
2017-01-11 14:18:38 +01:00
04f2a62fd4
Revert get_real_concrete_instance_class_id() dry attempt
...
Caused by f9fffc44c1
2017-01-11 14:17:26 +01:00
e06aa6ae80
Bump to v1.1b1
2017-01-10 17:19:44 +01:00
9cbfc7199b
Add polymorphic_formset_tags library
2017-01-10 17:18:51 +01:00
f9fffc44c1
Add API documentation to the package!
2017-01-09 16:53:50 +01:00
cf663a0e07
Update reset_polymorphic_ctype, improve ignore_existing parameter
2017-01-09 15:32:52 +01:00
add90aac4f
Replace assertEquals -> assertEqual
2017-01-09 15:14:55 +01:00
1f15a72a80
Moved polymorphic models back to tests/__init__.py, for Django 1.6-
2017-01-09 15:12:26 +01:00
11a471ae01
Add reset_polymorphic_ctype() function to assist with migration to polymorphic
2017-01-09 14:42:41 +01:00
b9f1709587
Update model paths in tests to new split test paths
2017-01-09 14:42:34 +01:00
9493bd8bc1
split tests.py into a python package
2017-01-09 14:41:56 +01:00
4aa3355f5c
flake8 fixes
2016-12-19 11:28:41 +01:00
3170ea95c2
autoflake: remove unused imports and statements
2016-12-19 11:12:40 +01:00
1d13b4f3c5
autopep8, except line length
2016-12-19 11:10:03 +01:00
695d352edb
Add polymorphic.contrib.extra_views to combine polymorphic with django-extra-views
2016-11-30 11:56:12 +01:00
186f9548b1
Bump to v1.0.2
2016-10-14 11:51:03 +02:00
58f89efa5d
Brush up the `ParentAdminNotRegistered` fix a bit for flow clarity.
2016-10-14 11:51:03 +02:00
37f92b3a3f
Fix get parent admin when intermediate not root ctype model is registered
...
This change fixes an issue where django-polymorphic raises a
`ParentAdminNotRegistered` exception when you register an admin for a
child model ancestor, but not for the root ancestor as pointed to by
the `polymorphic_ctype` field. This error occurs only when you *Save*
the child model detail form, not when you *Save and continue* on that
same form.
This situation occurs for us when using django-fluent-pages version
1.0.1 which has an intermediate `Page` model registered with a parent
admin to show the pages listing. The existing `_get_parent_admin` method
expects an admin to be registered for the root `UrlNode` model pointed
to by the `polymorphic_ctype` field.
This fix uses a potentially naive and slow brute-force approach where
it walks up the class hierarchy and checks whether a parent admin is
registered for each ancestor model, unless/until it finds one.
See also https://github.com/ic-labs/django-icekit/issues/31/
2016-10-13 09:35:13 +11:00
35dec27696
Remove unsupported fk_name parameter for `polymorphic_modelformset_factory()`
...
Fixes #243
2016-10-04 10:33:59 +02:00
8043e87b30
Wrap call to key() in list() so it can be indexed
...
In Python 3.4 trying to generate a polymorphic_inlineformset results in a TypeError with the following message: "'KeysView' object does not support indexing". This solves that problem by ensuring that `child_models` is a list, and thus can be referenced by index.
2016-09-21 09:56:20 -05:00
badad18a63
Merge pull request #238 from Quantra/dev
...
CSS tweak for Grappelli
2016-09-12 10:45:23 +02:00
7cd5f8455a
Merge pull request #235 from benkonrath/contrib-guardian
...
Add helper function for django-guardian.
2016-09-12 10:44:50 +02:00
e76259fa2e
Fix dumpdata hack on Windows
2016-09-12 10:35:47 +02:00
8f9f8ab4f7
Bump to 1.0.1
2016-09-11 21:34:37 +02:00
c97d1ef088
Let tests pass on Django 1.10.1
...
The change for https://code.djangoproject.com/ticket/27073
in d4eefc7e2a
2016-09-11 21:32:19 +02:00
20675986ba
Update polymorphic_inlines.css
...
Prevent div.polymorphic-add-choice overlapping previous inline formset when using Grappelli.
2016-09-03 15:14:01 +01:00
2d6832f844
Bump to 1.0
2016-09-02 12:42:22 +02:00
c8dd04bba0
Add explicit .empty-form hiding for grapelli
2016-09-02 10:41:47 +02:00
c695029cfa
Add helper function for django-guardian.
2016-09-01 12:15:21 +02:00
8811c177bd
remove unneeded import
2016-08-15 16:10:55 +02:00
Oleg Myltsyn
Diederik van der Boor
Diederik van der Boor
Omer Strumpf
Hugo Osvaldo Barrera
trbs
Jerome Leclanche
Tadas Dailyda
Krzysztof Nazarewski
Kamil Bar
Charlie Denton
un.def
Paweł Adamczak
James Murty
Chris Brantley
Quantra
Ben Konrath