Commit Graph

621 Commits (d1c58459665e74e3d99ff815d07124948e059af4)

Author SHA1 Message Date
Diederik van der Boor 08e900eb6d Merge pull request #69 from borgstrom/django16
Prevent infinite recursion in Django 1.6
2014-04-03 14:24:52 +02:00
Diederik van der Boor 157f6b1057 Fix missing ``alters_data = True`` annotations. 2014-04-03 14:10:53 +02:00
Evan Borgstrom d93add71fb Be more specific in the condition before setting 'fields' 2014-03-13 16:50:25 -04:00
Evan Borgstrom 134c44bef0 Prevent infinite recursion in Django 1.6 2014-03-13 16:39:13 -04:00
hottwaj 02221d7d10 changed dict.iteritems() call to dict.items() for python 3 compatibility... 2014-02-19 11:05:57 +00:00
hottwaj 578aa8f1dd removed pdb import which I used for testing... 2014-02-19 11:00:19 +00:00
hottwaj fd0ed96c1a Fixed bugs in superclass/subclass field link processingso that this can cope with proxy models, as well as parent_link and related_name links to parents.
Added a test case for testing parent_link and related_name links to parent.

All tests pass should pass now (at least they do for me on django 1.5 and python 2.7)
2014-02-19 10:56:02 +00:00
hottwaj 3e718d305e Changed methods used for traversing subclasses and superclasses of a given model.
Now uses model._meta.parents to determine superclasses.  _meta.parents is a dict of superclass: field_to_superclass pairs.

By using the field name of field_to_superclass, we can work out the field to use the django_polymorphic accessor on, even if a user-specified OneToOneField to parent is is used (with parent_link=True) to get to the parent in the inheritance hierarachy.

For subclasses, the path to the subclasses can be manually specified by the user if they use a 'related_name' on the OneToOneField from the subclass to the superclass.  I have changed the code to also support 'related_name' if present
2014-02-18 18:00:18 +00:00
Diederik van der Boor b73f22f4e0 cleanup: reorder tox envlist for readability 2014-02-13 10:44:06 +01:00
Diederik van der Boor 4be6d42fad Optimize NewBase test of six.with_metaclass() for Django 1.5+ 2014-02-13 10:43:33 +01:00
Diederik van der Boor 96ac22b55f Merge pull request #60 from dezede/translation
Adds a french translation.
2013-12-17 08:03:43 -08:00
Bertrand Bordage ed708c69c6 Adds a french translation. 2013-11-29 18:18:55 +01:00
Diederik van der Boor 669a4387d8 tests: update tox/Travis Djagno versions 2013-11-14 17:16:56 +01:00
Diederik van der Boor e1093ff1fb Fix .non_polymorphic(), returns a copy of the queryset
Just like .filter() and such do.
2013-09-19 19:36:05 +02:00
Diederik van der Boor 61e9a8050a Bump version to 0.5.3 2013-09-17 11:33:56 +02:00
Diederik van der Boor a8d27ca94e Pass ``/admin/app/model/ID/...`` URLs to the correct admin backend.
Using the ID field, the correct ``ct_id`` parameter can already be
determined.
2013-09-17 11:02:38 +02:00
Diederik van der Boor e0446bd76c Fix TypeError when ``base_form`` was not defined. 2013-09-17 10:50:46 +02:00
Diederik van der Boor b622d6f6a1 Bump version to 0.5.2 2013-09-05 11:38:26 +02:00
Diederik van der Boor 638ecd5813 Fix admin validation errors related to additional non-model form fields. 2013-09-05 11:36:54 +02:00
Diederik van der Boor e1cecc1a91 Add ContentType.objects.get_for_id() note to the docs. 2013-09-05 11:12:19 +02:00
Diederik van der Boor b2be0701ca Fix missing permission check in the "add type" view.
The permissions were checked in the next step,
so this didn't cause a security issue.
2013-08-20 12:07:29 +02:00
Diederik van der Boor 496e2c2cf2 Merge pull request #49 from funkybob/master
Document the polymorphic_list property
2013-07-29 04:04:49 -07:00
Curtis 1b4e1b021d Document the polymorphic_list property 2013-07-29 20:59:53 +10:00
Diederik van der Boor 9d00d214e1 Fix unwanted `___` handling when a fieldname starts with an underscore. 2013-07-22 10:21:00 +02:00
Diederik van der Boor d16f2d7590 Add changelog entry for Grappelli fix. 2013-07-18 21:17:00 +02:00
Diederik van der Boor cdc9b16aa8 Merge pull request #44 from BertrandBordage/master
Grappelli support & django-reversion support documentation.
2013-07-18 12:14:40 -07:00
Bertrand Bordage ec194164ea [Docs] Explains how to use django-reversion with polymorphic models. 2013-07-18 19:31:55 +02:00
Bertrand Bordage 9a068dde78 Doc typos. 2013-07-18 18:32:41 +02:00
Bertrand Bordage 2421f10ab5 Simplifies the two remaining templates (for grappelli support). 2013-07-18 16:38:14 +02:00
Diederik van der Boor 2138b7f2ac Fix Travis build for Django 1.6-git 2013-07-05 12:15:50 +02:00
Diederik van der Boor 19d226cd97 Bump version to 0.5.1 final 2013-07-05 12:09:31 +02:00
Diederik van der Boor 07f6b6eaa1 Add tox django-dev version test 2013-07-05 12:07:41 +02:00
Diederik van der Boor 77139ba2d3 Add tox test for docs
And ignore the warning about changelog_archive, it's really not meant to
be in the toctree.
2013-07-05 12:07:19 +02:00
Diederik van der Boor f34499a474 Add ChangeLog entry for Grappelli fix 2013-07-05 12:06:45 +02:00
Diederik van der Boor 53f6fd76ee Merge pull request #39 from BertrandBordage/master
Simplifies add_type_form.html. See #38.
2013-07-05 02:24:21 -07:00
Bertrand Bordage 40eeb15fad Simplifies add_type_form.html. See #38. 2013-06-07 13:39:33 +02:00
Diederik van der Boor f17493ebb9 Merge pull request #35 from fusionbox/django1.6
Another fix for Django 1.6 support

This addresses the removal of CHUNK_SIZE due to https://code.djangoproject.com/ticket/18702 in django/django@70679243d1
2013-05-25 05:07:23 -07:00
Gavin Wahl 1958146f10 Increase version and add django 1.6 support to the changelog 2013-05-24 15:37:01 -06:00
Gavin Wahl 7f2111c201 assertQuerysetEquals requires an ordered queryset 2013-05-24 15:17:44 -06:00
Gavin Wahl 93bc9fecdf Run travis tests on django dev 2013-05-24 15:13:57 -06:00
Gavin Wahl 71767431eb Django 1.6 support
CHUNK_SIZE has been removed from Django, so set it ourself if it can't
be imported.
2013-05-24 15:13:34 -06:00
Diederik van der Boor ef1feab709 Enable coveralls for testing 2013-05-22 10:58:18 +02:00
Diederik van der Boor ff22332d2c Remove Django 1.1 compatibility switch 2013-05-20 23:54:45 +02:00
Diederik van der Boor fed810b336 Update version numbers for 0.5 release 2013-05-20 18:03:35 +02:00
Diederik van der Boor 6ea15d87d6 Update Travis image in README 2013-05-20 18:02:54 +02:00
Diederik van der Boor 9b171e9ba2 docs: mention Python 3 support in quickstart 2013-05-20 17:57:00 +02:00
Diederik van der Boor 795441eed3 README typoo 2013-05-20 17:54:20 +02:00
Diederik van der Boor efe54284bc Mention RTD link in documentation too. 2013-05-20 17:53:49 +02:00
Diederik van der Boor e2027c3112 Improve README example 2013-05-20 17:51:53 +02:00
Diederik van der Boor 978b46fe93 Also update polymorphic version in the docs 2013-05-20 17:35:06 +02:00