Commit Graph

694 Commits (d36f55a58f7d5dfbd76c038e009a51815cf1cfca)

Author SHA1 Message Date
Charlie Denton a178ed751d
Test against Python 3.6 and Django 1.11b1 2017-03-03 22:16:54 +00:00
Michael Fladischer 0d6e448a99 Install django.contrib.contenttypes for docstrings.
This is merely cosmetic to avoid Django warning because of
`django.contrib.contenttypes` being referenced but not an installed app.
2017-03-01 15:21:23 +01:00
Michael Fladischer b0b4b826f5 Replace force_unicode with force_text for Python3 compatibility.
`force_unicode` has been [deprecated](https://docs.djangoproject.com/en/1.10/ref/utils/#django.utils.encoding.force_unicode) and replaced with `force_text`[0].
Furthermore, `force_unicode` is not available in Python3, causing the
documentation to be unbuildable with Python3 sphinx.
2017-03-01 15:16:07 +01: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 c2aff50ecc Fix changelog date for 1.1 2017-02-06 13:37:05 +01: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 e28d7cb9f5 Merge pull request #258 from n1ncha/master
Update advanced.rst
2017-02-03 21:49:02 +01:00
Diederik van der Boor ed09e4db93 Fixed Python 2.6 issue 2017-02-03 21:44:38 +01:00
n1ncha fb10deaa8c Update advanced.rst
fixed import for ShowFieldType
2017-01-18 11:32:26 -05: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 c76cc663e0 docs: mention RunPython.noop and reset_polymorphic_ctype() 2017-01-09 15:34:45 +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 55de14b8f7 be explicit to ignore line length 2016-12-19 11:32:39 +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
Diederik van der Boor 3570d10754 Merge pull request #246 from ixc/feature/fix-non-root-parent-admin-lookup
Fix get parent admin when intermediate not root ctype model is registered
2016-10-14 11:40:10 +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 db6d7ed213 Update changelog with recent git changes 2016-10-04 11:21:20 +02: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
Diederik van der Boor 3dcb8e7e06 Merge pull request #242 from chrisbrantley/chrisbrantley-patch-1
Wrap call to key() in list() so it can be indexed
2016-10-04 10:31:51 +02:00
Diederik van der Boor 19745c6740 Merge pull request #241 from benkonrath/fix-contrib-guardian-docs
Improve django-guardian integration docs.
2016-10-04 10:31:14 +02:00
Diederik van der Boor f4bee9d34f Merge pull request #240 from AlJohri/patch-1
change django 1.9 to 1.10 in quickstart
2016-10-04 10:30:39 +02:00
Diederik van der Boor a527fd5da6 Merge pull request #239 from angvp/readme_improvements
Readme improvements
2016-10-04 10:30:23 +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
Ben Konrath d7fb5a1fac Improve django-guardian integration docs. 2016-09-20 21:40:45 +02:00
Al Johri a49daa65a9 change django 1.9 to 1.10 in quickstart 2016-09-20 00:23:41 -04:00
Angel Velasquez 8bd040a15c Add installation instructions on README 2016-09-19 14:52:13 -03:00
Angel Velasquez 0da4c7ad29 Fix link of pypi it was taking data from polymorphic-tree instead polymorphic 2016-09-19 14:50:23 -03: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 7fec242912 add missing changelog entry for 0.9 2016-09-12 10:39:54 +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