Commit Graph

315 Commits (a57b067b425a40678238a88cf5cc330cc44b44aa)

Author SHA1 Message Date
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