Commit Graph

589 Commits (41cb0e82916aff5ce38c04b6084d99438ae3b5d2)

Author SHA1 Message Date
Jedediah Smith 58c4f6f697 Optimization - don't do extra queries for proxy models 2013-04-08 00:05:21 +02:00
floppya 74389bb23d Update for proxy models and Django 1.5
Only monkeypatch when using Django < 1.5
Updated test
2013-04-08 00:05:21 +02:00
Jedediah Smith e2cfbf3898 Support proxy models (still requires one query per proxied model, not optimal) 2013-04-07 23:36:09 +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
Chris Glass 3566c5ed5c Made Diederik a core developer! Thanks a lot for your work!
(Core developers have master commit rights)
2013-04-07 23:29:58 +02: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
Chris Glass 62d97f29b1 Merge pull request #30 from vdboor/cleanup_for_15
Cleanup before porting to Django 1.5
2013-04-05 03:09:42 -07: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
Chris Glass 33c3efbfbe Merge pull request #29 from julianwachholz/master
django.conf.urls.defaults is deprecated
2013-04-05 01:23:46 -07: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
Julian Wachholz a6f8429aae django.conf.urls.defaults is deprecated; use django.conf.urls instead 2013-04-04 23:41:07 +03: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
Chris Glass 1d42927382 Bumped version in setup.py. 2013-03-25 10:11:09 +01:00
Chris Glass 2aadab6038 Added Adam to AUTHORS. Thanks a lot! 2013-03-25 10:07:50 +01:00
Chris Glass ced37a4872 Merge pull request #26 from floppya/update-gitignore
Ignore egg-info
2013-03-25 02:05:00 -07:00
Chris Glass 30172d3110 Merge pull request #24 from onepercentclub/port-regression-doctest-to-unit-test
Port regression doctest to unit test
2013-03-25 02:04:07 -07:00
Chris Glass 60c1d43332 Merge pull request #23 from onepercentclub/update-urls
Update urls
2013-03-25 02:03:12 -07:00
Chris Glass 272673f7c3 Merge pull request #22 from onepercentclub/add-travis-config
Add travis config.
2013-03-24 05:17:30 -07:00
floppya 8b6e3a0979 Ignore egg-info 2013-03-23 14:14:13 -06:00
Ben Konrath 8e4697c741 Port regression doctest to unit test. 2013-03-18 22:33:55 +01:00
Ben Konrath dc6f41c7e9 Update URLs to github hosted webpage. 2013-03-18 21:27:23 +01:00
Ben Konrath 7f2f8a1d7f Add travis config. 2013-03-18 21:16:34 +01:00
Chris Glass 7cb733af72 Added Ben to AUTHORS. Thanks a lot! 2013-03-18 21:10:11 +01:00
Chris Glass 758eb577e4 Merge pull request #20 from onepercentclub/add-tox-config
Add tox config
2013-03-18 13:09:07 -07:00
Ben Konrath 318dd3d67a Fixed the default manager test failures.
According to the django docs (1.4 / 1.5), the default manager for subclasses of
PolymorphicModel should be PolymorphicManager:

3. The default manager on a class is either the first manager declared on the
   class, if that exists, or the default manager of the first abstract base
   class in the parent hierarchy, if that exists. If no default manager is
   explicitly declared, Django’s normal default manager is used.

https://docs.djangoproject.com/en/1.4/topics/db/managers/#custom-managers-and-model-inheritance
https://docs.djangoproject.com/en/1.5/topics/db/managers/#custom-managers-and-model-inheritance
2013-03-18 20:56:12 +01:00
Ben Konrath b718acf005 Update db_type method for Django >= 1.4 DB settings format. 2013-03-18 20:50:45 +01:00
Ben Konrath 1ef9e068df Import settings in tests from django.conf. 2013-03-18 20:47:56 +01:00
Ben Konrath 102817e54c Update DB settings for Django >= 1.4. 2013-03-18 20:47:16 +01:00
Ben Konrath 25821cd4da Add tox configuration file.
Note: The tests do not currently pass.
2013-03-18 20:11:03 +01:00
Chris Glass 6b7edd06a6 Merge pull request #21 from vdboor/master
Remove unused load statements in add_type_form.html
2013-03-18 07:37:13 -07:00
Diederik van der Boor 720a189f5a Remove unused load statements in add_type_form.html
This addresses Django 1.5 compatibility as well (see #16)
2013-03-18 12:15:10 +01:00
Chris Glass 51b789cdc6 Point release fixes a merge error. 2013-02-28 11:27:51 +01:00
Chris Glass c1d00ed5c1 Merge branch 'master' of github.com:chrisglass/django_polymorphic 2013-02-28 11:26:44 +01:00
Chris Glass 72e1a144c1 Bumped setup.py version, Changes, for 0.3 release 2013-02-28 11:22:31 +01:00
Chris Glass 2c1c5d7630 Merge pull request #12 from vdboor/master
Avoid SQL query in pre_save_polymorphic()
2013-02-24 05:07:07 -08:00
Chris Glass c22e50662d Merge branch 'install-admin-templates' of https://github.com/onepercentclub/django_polymorphic into onepercentclub-install-admin-templates
Conflicts:
	MANIFEST.in
2013-02-24 14:04:31 +01:00
Chris Glass 183d69ae87 Merge pull request #14 from thenewguy/master
remove trailing slash
2013-01-31 12:45:32 -08:00
gordon 9de33bd172 remove trailing '/' 2012-12-16 19:22:02 -05:00
Ben Konrath e5eaaa987c Include templates in install. 2012-12-10 18:02:12 +01:00
Ben Konrath eee5dda5ba Small admin documentation fix. 2012-12-10 15:41:45 +01:00