Diederik van der Boor
77797bfa12
Ensure consistent ordering in testing reset_polymorphic_ctype
...
Amends: 171d14f369
2017-08-01 13:51:42 +02:00
Diederik van der Boor
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
Diederik van der Boor
e10deeaebd
Remove test imports that Django 1.5- required
2017-08-01 12:17:10 +02:00
Diederik van der Boor
4835cd244e
Also introduce a new exception type for invalid database IDs
2017-08-01 11:44:21 +02:00
Diederik van der Boor
fb8eed78ad
Provide a better error message when polymorphic_ctype_id is Null
...
refs #51 , #140 , #304
2017-08-01 11:44:21 +02:00
Diederik van der Boor
b772c06358
move contrib tests to separate file
2017-08-01 11:44:21 +02:00
Diederik van der Boor
fe0880e413
Merge pull request #300 from nazarewk/patch-1
...
`declared_fieldsets` typo fix
2017-08-01 11:38:13 +02:00
Diederik van der Boor
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
Diederik van der Boor
1ce58a0b54
Bump to v1.3 - note: support for old Django versions dropped!
2017-08-01 11:07:24 +02:00
Tadas Dailyda
02330a5ec8
skip manager validation on swapped models
2017-07-25 14:11:37 +03:00
Tadas Dailyda
0fea8a4d92
tests for abstract/swappable model initialization
2017-07-25 14:02:15 +03: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
Krzysztof Nazarewski
697df65c7b
`declared_fieldsets` typo fix
2017-07-05 13:45:28 +02: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
Diederik van der Boor
66619371fd
remove empty test_models.py file
2017-02-03 22:05:13 +01:00
Diederik van der Boor
ed09e4db93
Fixed Python 2.6 issue
2017-02-03 21:44:38 +01:00
Diederik van der Boor
d11bb17809
Bump to v1.1b:
2017-01-11 14:18:38 +01:00
Diederik van der Boor
04f2a62fd4
Revert get_real_concrete_instance_class_id() dry attempt
...
Caused by f9fffc44c1
2017-01-11 14:17:26 +01:00
Diederik van der Boor
e06aa6ae80
Bump to v1.1b1
2017-01-10 17:19:44 +01:00
Diederik van der Boor
9cbfc7199b
Add polymorphic_formset_tags library
2017-01-10 17:18:51 +01:00
Diederik van der Boor
f9fffc44c1
Add API documentation to the package!
2017-01-09 16:53:50 +01:00
Diederik van der Boor
cf663a0e07
Update reset_polymorphic_ctype, improve ignore_existing parameter
2017-01-09 15:32:52 +01:00
Diederik van der Boor
add90aac4f
Replace assertEquals -> assertEqual
2017-01-09 15:14:55 +01:00
Diederik van der Boor
1f15a72a80
Moved polymorphic models back to tests/__init__.py, for Django 1.6-
2017-01-09 15:12:26 +01:00
Diederik van der Boor
11a471ae01
Add reset_polymorphic_ctype() function to assist with migration to polymorphic
2017-01-09 14:42:41 +01:00
Diederik van der Boor
b9f1709587
Update model paths in tests to new split test paths
2017-01-09 14:42:34 +01:00
Diederik van der Boor
9493bd8bc1
split tests.py into a python package
2017-01-09 14:41:56 +01:00
Diederik van der Boor
4aa3355f5c
flake8 fixes
2016-12-19 11:28:41 +01:00
Diederik van der Boor
3170ea95c2
autoflake: remove unused imports and statements
2016-12-19 11:12:40 +01:00
Diederik van der Boor
1d13b4f3c5
autopep8, except line length
2016-12-19 11:10:03 +01:00
Diederik van der Boor
695d352edb
Add polymorphic.contrib.extra_views to combine polymorphic with django-extra-views
2016-11-30 11:56:12 +01:00
Diederik van der Boor
186f9548b1
Bump to v1.0.2
2016-10-14 11:51:03 +02:00
Diederik van der Boor
58f89efa5d
Brush up the `ParentAdminNotRegistered` fix a bit for flow clarity.
2016-10-14 11:51:03 +02:00
James Murty
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
Diederik van der Boor
35dec27696
Remove unsupported fk_name parameter for `polymorphic_modelformset_factory()`
...
Fixes #243
2016-10-04 10:33:59 +02:00
Chris Brantley
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
Diederik van der Boor
badad18a63
Merge pull request #238 from Quantra/dev
...
CSS tweak for Grappelli
2016-09-12 10:45:23 +02:00
Diederik van der Boor
7cd5f8455a
Merge pull request #235 from benkonrath/contrib-guardian
...
Add helper function for django-guardian.
2016-09-12 10:44:50 +02:00
Diederik van der Boor
e76259fa2e
Fix dumpdata hack on Windows
2016-09-12 10:35:47 +02:00
Diederik van der Boor
8f9f8ab4f7
Bump to 1.0.1
2016-09-11 21:34:37 +02:00
Diederik van der Boor
c97d1ef088
Let tests pass on Django 1.10.1
...
The change for https://code.djangoproject.com/ticket/27073
in d4eefc7e2a
removed the _default_manager assignment
2016-09-11 21:32:19 +02:00
Quantra
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
Diederik van der Boor
2d6832f844
Bump to 1.0
2016-09-02 12:42:22 +02:00
Diederik van der Boor
c8dd04bba0
Add explicit .empty-form hiding for grapelli
2016-09-02 10:41:47 +02:00
Ben Konrath
c695029cfa
Add helper function for django-guardian.
2016-09-01 12:15:21 +02:00
Diederik van der Boor
8811c177bd
remove unneeded import
2016-08-15 16:10:55 +02:00
Diederik van der Boor
83cb059317
Fix marking a new formset item as empty-form on postback errors
2016-08-15 16:03:08 +02:00
Diederik van der Boor
4a60c1fb60
Bump to 1.0b1
2016-08-15 11:22:45 +02:00
Diederik van der Boor
22cef13f69
Fix Python 3 tests
2016-08-10 14:29:03 +02:00
Diederik van der Boor
e20401d8bc
Fixed the Python 3 unittests
2016-08-10 14:02:36 +02:00
Diederik van der Boor
cf1d4b532d
Merge branch 'django110'
2016-08-10 13:55:37 +02:00
Diederik van der Boor
b4a02e9c47
Let last base_manager test allow different results in Django 1.10
...
This is after all, how Django 1.10's new base manager works.
2016-08-10 13:55:09 +02:00
Diederik van der Boor
bb0e71ee8f
autopep8 by pycharm
2016-08-10 13:54:44 +02:00
Diederik van der Boor
10ab3ad14c
Fix compatibility with older Django versions
2016-08-10 13:51:30 +02:00
Diederik van der Boor
3817061467
Fix unit tests for defer() / only()
...
Added get_deferred_fields() to ShowFieldBase
2016-08-10 13:43:31 +02:00
Diederik van der Boor
dd89458615
Fixed expressions unit test, DateTime refactored in Django 1.10
2016-08-10 13:20:16 +02:00
Diederik van der Boor
8bce015199
Add missing `polymorphic_modelformset_factory` method
2016-08-10 12:50:15 +02:00
Diederik van der Boor
352b56e104
Merge branch 'feature/inlines'
2016-08-10 11:48:02 +02:00
Diederik van der Boor
60db4f63b9
Update polymorphic inline script.
...
Now based on standard Django script.
This makes upgrading it to newer Django versions much easier.
Changes for polymorphic are included in this commit
2016-08-10 11:45:48 +02:00
Diederik van der Boor
249fc0088b
Import standard Django inlines script, to be adjusted for polymorphic
2016-08-10 11:42:31 +02:00
Diederik van der Boor
59e3878835
Add detection for missing PolymorphicInlineSupportMixin
2016-08-09 01:21:37 +02:00
Diederik van der Boor
7330a4f099
Add preliminairy working JavaScript to render polymorphic inlines
2016-08-09 01:20:40 +02:00
Diederik van der Boor
1f0ddd8436
Rename inline/formset classes to avoid more confusion.
...
AbstractSingletonProxyFactoryBean danger luked here...
Added the Stacked...Inline for clarity too.
2016-08-09 01:11:05 +02:00
Diederik van der Boor
2e694fb2c6
Fix for removed `Q.clone()` method in Django 1.10
2016-08-05 17:26:32 +02:00
Diederik van der Boor
1a998733e1
Fix QuerySte repr output for Django 1.10 in unit tests
2016-08-05 17:21:53 +02:00
Diederik van der Boor
a5e348ffb9
Disable the old _default_manager and _copy_to_model() fiddling.
...
This no longer works on Django 1.10, which has a new way to find the
default manager
2016-08-05 17:21:18 +02:00
Diederik van der Boor
ac98a8123a
Raise ParentAdminNotRegistered instead of KeyError
2016-07-08 12:06:04 +02:00
Diederik van der Boor
b1f037dd68
Merge pull request #221 from Corvia/master
...
#220 Pass hints to returned queryset in PolymorphicManager.get_queryset.
2016-06-15 10:38:10 +02:00
Tadas Dailyda
0edd0d4acd
fix redirects after child model add/change in PolymorphicChildModelAdmin
2016-06-14 19:17:04 +03:00
Austin Matsick
b254c3fc97
#220 Skip `test_save_to_non_default_database` on Django 1.4.
2016-06-13 09:00:48 -05:00
Diederik van der Boor
c1ee5aad0b
Improve #215 to handle cases where the real_admin points back to self.
...
When the base model also serves as child model, the flow no longer
points to the child admin, but returns `self` instead. Either every user
of `_get_real_admin()` should detect this, or we return the super method
as convenience.
2016-06-13 10:53:29 +02:00
Diederik van der Boor
8c42893abd
docs start for formset/inline support
2016-06-13 10:18:18 +02:00