Briq/django-polymorphic
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
272 Commits 1 Branch 0 Tags
c79bb09b8716ed0ecdbf26a13d4a330ee4234b91
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Diederik van der Boor c79bb09b87 update AUTHORS 2014-09-22 16:01:07 +02:00
Diederik van der Boor 981614e5c6 Merge branch 'django_1.7_support' of https://github.com/g3rd/django_polymorphic 
Conflicts:
	docs/managers.rst
	polymorphic/admin.py
	polymorphic/manager.py
	polymorphic/tests.py
	runtests.py
 2014-09-22 15:42:35 +02:00
Diederik van der Boor 263e569f4e modernize runtests to fix app loading 2014-09-22 15:15:17 +02:00
Diederik van der Boor ff6b09e7c7 admin: split get_queryset() / queryset() methods. 
avoid calling loops due to some inherited classes
 2014-09-22 15:14:32 +02:00
Diederik van der Boor 30eb88fbdb Travis and tox: add Django 1.7 2014-09-22 15:01:49 +02:00
Diederik van der Boor be54fd9085 docs: use new get_queryset() notation too 2014-09-22 15:00:52 +02:00
Diederik van der Boor cf6d2a4a41 Replace get_query_set with assignment. 
Avoid calling the super class by accident, potentially causing loops.
Follow the django-mptt approach here.
 2014-09-22 15:00:29 +02:00
Diederik van der Boor 25b720c43c Merge pull request #94 from benkonrath/consistent-admin-labels 
Use consistent labels in admin
 2014-08-12 09:35:01 +02:00
Diederik van der Boor a2f12177ad changelog: mention the backwards incompatibility that #93 introduces. 
This at least affects one of own projects.
 2014-07-29 14:40:32 +02:00
Diederik van der Boor 14df8c529e Move the get_permission_codename import to the main code. 
cc #93
 2014-07-29 12:15:09 +02:00
Diederik van der Boor bbb1cd068a Merge pull request #93 from Skeptiker88/master 
added permission check for all child types
 2014-07-29 12:13:45 +02:00
Diederik van der Boor 1490af29b0 Merge pull request #92 from davesque/patch-1 
Typo in documentation
 2014-07-28 11:38:19 +02:00
Diederik van der Boor 831075c3c7 bump version to 0.5.6 2014-07-21 11:42:26 +02:00
Diederik van der Boor 656a8580e4 Changelog: mention fix by @jrief 2014-07-21 11:41:46 +02:00
Diederik van der Boor e9b7c57e31 Merge pull request #88 from jrief/fix-mix-polymorphic-with-parler 
django-polymorphic does not work with django-parler
 2014-07-21 11:38:56 +02:00
Diederik van der Boor d8b40167d3 Mention the improvements of #87 in the changelog and documentation too. 2014-07-08 17:18:07 +02:00
Diederik van der Boor 2e2728e2c6 Merge pull request #87 from krayevidi/master 
Adds pk_regex attr in PolymorphicParentModelAdmin
 2014-07-08 17:14:54 +02:00
Diederik van der Boor ba941165ab set date in changelog as well 2014-04-29 14:13:10 +02:00
Diederik van der Boor 8a548ca829 bump version to 0.5.5 2014-04-29 14:11:58 +02:00
Diederik van der Boor b9d7e9f234 Improved description of test_proxy_get_real_instance_class unit test 
Camp life rule: leave things better then you found them.
 2014-04-29 14:07:33 +02:00
Diederik van der Boor 5499901db7 Merge branch 'jf/polymorphic' of https://github.com/gnulnx/django_polymorphic into gnulnx-jf/polymorphic 2014-04-29 14:04:53 +02:00
Diederik van der Boor 4af7f49908 Added changelog entry for PR #77 2014-04-29 11:58:49 +02:00
Diederik van der Boor adf0be6579 Merge pull request #77 from gnulnx/jf/polymorphic 
Fix proposal for get_real_instance_class() for proxy models
 2014-04-29 11:56:15 +02:00
Diederik van der Boor 36d1cc2961 Merge pull request #75 from vail130/master 
Fixed tab spacing in admin.rst
 2014-04-22 13:49:42 +02:00
Diederik van der Boor be8d7d016f Merge pull request #74 from vail130/master 
Added to admin docs how to add polymorphic child model as inline.
 2014-04-22 11:17:04 +02:00
Diederik van der Boor bf64b111c4 Merge pull request #73 from utapyngo/master 
Fixed typo: CopntentType
 2014-04-18 14:33:04 +02:00
Diederik van der Boor 6c58acac8d bump version and changelog 2014-04-09 12:11:29 +02:00
Diederik van der Boor 35cdb7b697 Fix subclass protection when ContentType is stale 2014-04-07 14:38:34 +02:00
Diederik van der Boor e8d5ce6231 Add protection against mixed up ContentType tables 2014-04-04 15:28:47 +02:00
Diederik van der Boor acf1ddc086 update changelog too for #69 2014-04-03 14:29:09 +02:00
Diederik van der Boor b5774423f7 Improve on #69, using setdefault() and update example project 
Camp site rule; leave things tidier than you found them :)
 2014-04-03 14:27:56 +02:00
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
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
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
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
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
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
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
Diederik van der Boor 393f7c5f30 Python 3.2 support confirmed. 2013-05-20 17:34:09 +02:00
Diederik van der Boor 83238697d2 Setup.py: update trove classifiers, read version from code. 2013-05-20 17:12:38 +02:00
Diederik van der Boor 6a32ffbf98 Docs: mention python 3 support 2013-05-20 17:12:25 +02:00
Diederik van der Boor fbcd68a220 Travis: don't test Django 1.4 against Python 3 2013-05-20 16:59:56 +02:00
Diederik van der Boor 4d7d33ed0d Port new code to Python 3 as well, fix six.with_metaclass() issues 
Many thanks to @atheiste for the big porting steps!
 2013-05-20 16:03:21 +02:00
Diederik van der Boor 73c378a369 docs: remove tar file reference 2013-05-20 16:03:07 +02:00
Diederik van der Boor 705e7fc037 Fix the changelog date of version 0.2 2013-05-19 20:51:29 +02:00
Diederik van der Boor 93a6592649 Mention the word "inherited models" in the docs more often 
..to give some SEO juice to the project because developers are looking
for "inherited models" instead of "polymorphism".
 2013-05-19 17:19:24 +02:00
Diederik van der Boor c933be9c24 Port documentation to Sphinx, cleanup README 2013-05-19 17:15:41 +02:00
Diederik van der Boor 8cf313335c Handle stale ContentType models (no longer referring to a model) 
This builds on top of a fix in Django 1.6, and has a workaround for
Django 1.4 and 1.5. When the base class points to a model that no longer
exists, it will be silently dropped in the polymorphic queryset results.

This behavior is identical to iterating over results when the derived
table doesn't have the object anymore.
 2013-05-19 14:35:29 +02:00
Diederik van der Boor 762265e28a Travis: avoid bombarding IRC with everyone's fork 2013-04-08 12:28:33 +02:00
Diederik van der Boor 2e109101fc Fix and update Travis configuration 2013-04-08 11:38:20 +02:00
Diederik van der Boor 7889293227 Applied an overal cleanup of the .gitignore file 2013-04-08 11:30:50 +02:00
Diederik van der Boor ec1fd53974 Added Adam en Jedediah to AUTHORS for their contributions! 2013-04-08 11:29:55 +02:00
Diederik van der Boor 4106ad7296 Apply list filter in example app 2013-04-08 00:37:51 +02:00
Diederik van der Boor 7c2fb9dbfa Merge branch 'proxy_models_15' - add proxy model support! 2013-04-08 00:32:55 +02:00
Diederik van der Boor bb0a4daddc Optimize transmogrify() function, assign __class__ instead. 2013-04-08 00:32:06 +02:00
Diederik van der Boor a0ab068449 Included Proxy models in example app. 2013-04-08 00:32:06 +02:00
Diederik van der Boor ea9cb91e78 Rename variables in polymorphic/query.py for clarity 
(split from previous commit by @jedediah)
 2013-04-08 00:32:06 +02:00
Diederik van der Boor 19d5ed2338 Fix base_manager unit test 
As more methods are added to the PolymorphicModel, the attr dict changes
ordering in the meta class. By making the ordering of managers
consistent, this problem no longer occurs.
 2013-04-08 00:32:02 +02:00
Diederik van der Boor 12e6278741 Merge pull request #33 from vdboor/fix_related_queryset 
Fix related queryset (please merge before #32)
 2013-04-07 14:35:24 -07:00
Diederik van der Boor 38a230891c Merge pull request #31 from vdboor/django15 
Fix Django 1.5 (proxy models broke polymorphism)
 2013-04-07 14:33:49 -07:00
Diederik van der Boor 78253bfe12 Fix passing custom querysets to related managers. 
* The custom manager was not assigned to _default_manager;
  get_first_user_defined_manager() always returned None
* The PolymorphicManager couldn't remember it's custom queryset;
  a RelatedManager creates a new instance of a manager, so the queryset
  parameter should be known at class-level, not object level.
* The old method of providing a custom queryset class has been deprecated.
 2013-04-07 01:39:58 +02:00
Diederik van der Boor 1f26302632 Fix Django 1.5 support, tests pass again. 
The reason polymorphic broke was because it couldn't find some managers
anymore in the inheritance tree. Django 1.5 removes these and replaces
them with an `AbstractManagerDescriptor`. This patch restores those objects
 2013-04-07 00:43:41 +02:00
Diederik van der Boor ca4067e279 Add proxy model test that fails in Django 1.5 2013-04-05 17:36:50 +02:00
Diederik van der Boor e411660b80 Tests: fix missed error in last commit 
(cannot amend, already pushed for review)
 2013-04-05 12:01:44 +02:00
Diederik van der Boor ebced5f4eb Tests: make old code more readable 2013-04-05 11:45:07 +02:00
Diederik van der Boor 7ca328f9e4 Tests: auto removed unused imports 2013-04-05 11:39:57 +02:00
Diederik van der Boor 2d83124f51 Tests: remove Django 1.1 compatibility check 2013-04-05 11:38:56 +02:00
Diederik van der Boor 25aa32d7bd Replaced the doctests with unit tests 
Making debugging tests much easier. The same repr() logic is preserved,
so this is essentually a huge coding style change.
 2013-04-05 11:33:41 +02:00
Diederik van der Boor 32426aa41a Use self.assertEqual() in tests instead of assert statement. 2013-04-05 09:54:48 +02:00
Diederik van der Boor 1df5b5ff03 Add runtests script 
Allow `python setup.py test` too.
Fix tox invocation now that `manage.py` has moved.
 2013-04-05 09:52:53 +02:00
Diederik van der Boor e7a2340723 Remove polymorphic_dumpdata command and assorted scripts. 
The polymorphic_dumpdata command carried a deprecation note for a long
time now. The scripts for testing python versions are replaced by tox already.
 2013-03-28 14:16:45 +01:00
Diederik van der Boor 06ac5a4795 Convert Django project files in the root to example project. 
Move pexp project to 'example' folder too.
 2013-03-28 14:16:45 +01:00
Diederik van der Boor addf2854e1 Cleanup pexp commands, remove direct settings import 2013-03-28 13:52:44 +01:00