Chris Glass
9b9838116d
Bumped version to 0.4.2
...
Previous verison had a broken setup.py
2013-04-10 14:15:05 +02:00
Chris Glass
3a29da5133
Bumped version to 0.4.1
2013-04-10 14:11:06 +02:00
Chris Glass
e38b7002f4
Merge branch 'master' of github.com:chrisglass/django_polymorphic
2013-04-10 14:10:15 +02:00
Chris Glass
9c5c6c5136
Made the version number logic saner
2013-04-10 14:09:46 +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
floppya
a214cd58f7
Adds admin list filter for polymorphic child models.
2013-04-08 00:35:55 +02:00
Adam Wentz
04dce421e5
Fixes PolymorphicQuerySet for django 1.6
...
QuerySet.dup_select_related has been removed.
2013-04-08 00:35:22 +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
floppya
54cf2f37d8
Updated proxy model tests
...
Extracted classes from original proxy test.
Added another simple proxy model test.
Moved the test case to a seemingly better spot.
2013-04-08 00:32:06 +02:00
floppya
20ac209dbb
Fixes proxy models in the admin
...
The PolymorphicParentModelAdmin was getting the concrete model ids for
the add form.
2013-04-08 00:32:06 +02:00
Jedediah Smith
1a6f3a45e5
Handle non-distinct results from base object query
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
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