Briq
/
django-polymorphic
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
807 Commits
1 Branch
0 Tags
1.4 MiB
Commit Graph

807 Commits (e72a11d12c49eb83c48c99e4e7a5541d0bb43361)

Author SHA1 Message Date
Diederik van der Boor c947c3dec1 Merge pull request #119 from theatlantic/child-model-custom-pk-bug 
Bug with queryset results on base model where child model has a custom primary key
 2015-04-08 13:09:35 +02:00
Diederik van der Boor d16d989e91 Merge pull request #118 from theatlantic/_default_manager-instance-fix 
Set _default_manager directly on model_cls; don't use add_to_class()
 2015-04-08 13:06:12 +02:00
Nick Ward 90933184e9 Modified polymorphic_ctype related_name to be valid 2015-03-11 16:33:19 +00:00
Ben Konrath 2a8a16edb8 Don't remove '/' from id when it's not in the path 2015-03-02 11:24:50 +01:00
Diederik van der Boor 7edafcfab8 Merge pull request #117 from ellmetha/master 
Django 1.8 alpha support
 2015-02-23 12:07:33 +01:00
Luis Zárate 727df8bd3d Fixed preserved filter for django 1.7 
The problem occurs when you have a filter and create o delete a child, when is back to change list
the filter is lost, and have a e=-1 as a get parameter
 2015-02-09 08:15:42 -06:00
Frankie Dintino 1be1fc02db Fix missing items bug in qset on child of PolymorphicModel w custom pk 
fixes #66
 2015-01-31 17:11:03 -05:00
Frankie Dintino ad63c6a442 Test missing items bug in qset on child of PolymorphicModel w custom pk 
refs #66
 2015-01-31 17:10:57 -05:00
Frankie Dintino fd24863db5 Cleanup tests by removing spurious errors and unnecessary noise 
- Remove diamond inheritance tests since these test a bug in Django,
  not in django_polymorphic.
- Fix spurious print message in test_primary_key_custom_field_problem(),
  where uuid instances are for some reason being compared to uuid.UUID
  classes. Replaced with a test that checks that the primary key values
  are valid UUIDs.
- Remove Django > 1.6 conditionals wrapping the multiple inheritance
  tests and model definitions, in favor of using the definitions for
  Django 1.7. Django 1.7 requires a custom primary key when using concrete
  model inheritance because failing to do so is potentially ambiguous. Adding
  the custom primary key does not break tests in older Django versions.
 2015-01-31 16:59:55 -05:00
Frankie Dintino a3d9379876 Set _default_manager directly on model_cls; don't use add_to_class() 
Using model_cls.add_to_class() calls Manager.contribute_to_class(),
which then sets the attribute to an instance of ManagerDescriptor. In
the case of _default_manager, this behavior differs from Django's, as
_default_manager is set to the manager instance itself, not its
descriptor. This is why it is normally possible to access default_manager
from a model instance.

fixes #96
 2015-01-31 13:17:56 -05:00
Chris Barna d56d9bfd15 Add tests for instance._default manager. Refs #96 2015-01-31 13:17:56 -05:00
ellmetha 469d063cc9 Django 1.8 alpha support 2015-01-28 00:41:34 +01:00
Diederik van der Boor bf0d37a91c Added changelog mention for PR #67 2014-12-30 13:39:46 +01:00
Diederik van der Boor ca6fba91ba PEP8-ify PR #67 and fix trailing whitespace 
Camp rule: leave things in a better state then you found it.
 2014-12-30 13:36:25 +01:00
Diederik van der Boor 261e382556 Merge pull request #67 from hottwaj/parent_link_support 
parent_link and related_name support for inheritance fields
 2014-12-30 13:34:16 +01:00
Diederik van der Boor b173318b8c Bump Version 
(setup.py was already up to date)
 2014-12-30 13:32:20 +01:00
Diederik van der Boor 8ef9085a04 Update changelog 2014-12-30 13:30:05 +01:00
Diederik van der Boor 4d526d8780 Simplify selecting get_queryset() vs get_query_set() -> use self.all() 2014-12-30 13:25:22 +01:00
Diederik van der Boor 4bddac7c70 Fix validate_model_fields(), caused errors when metaclass raises errors 2014-10-29 18:58:54 +01:00
Diederik van der Boor aead57c037 Fix Django 1.4/1.5 issues with RelatedManager code that overrides get_query_set() 
Make sure the `RelatedManager.get_query_set()` is called, which limits
the set, instead of calling `self.get_queryset()` which then returns a new queryset.

Fortunately, this only happened on proxied calls for unknown methods.
 2014-10-16 16:07:17 +02:00
Diederik van der Boor 6d043d35d2 Bump version to 0.6.1 already 2014-10-14 17:32:40 +02:00
Diederik van der Boor 948749dbdb Remove Django 1.7 warnings 2014-10-14 17:30:25 +02:00
Diederik van der Boor 2582613b77 Add wheel support 2014-10-14 16:30:18 +02:00
Diederik van der Boor c9e232a79b Bump version to 0.6 2014-10-14 16:29:30 +02:00
Diederik van der Boor 454ecb344a example: silence Django 1.7 system check 2014-10-14 16:28:01 +02:00
Diederik van der Boor e9e4719fd3 Merge pull request #106 from njamaleddine/master 
Updated README.rst
 2014-09-29 11:44:41 +02:00
Nabil 9e1bb57a4b Updated README.rst 
Fixed minor spelling error
 2014-09-28 15:10:16 -04:00
Diederik van der Boor 45b6975f8e runtests: declare TEST_RUNNER to avoid Django 1.7 check warnings. 2014-09-22 16:44:06 +02:00
Diederik van der Boor 2c88bbc1f0 Update Changelog for Django 1.7 compatibility 2014-09-22 16:09:20 +02:00
Diederik van der Boor 84791daf47 Merge pull request #99 from benkonrath/admin_class_permissions 
Use admin class function to check permissions.
 2014-09-22 16:03:55 +02:00
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 ea160669cf Merge pull request #91 from mlsen/master 
Django 1.8 compatibility
 2014-09-22 14:51:03 +02:00
Chad Shryock cc53b3003e Remove exception. 2014-09-17 08:30:12 -04:00
Chad Shryock b9654b7138 Missing return. 2014-09-17 08:26:28 -04:00
Chad Shryock 112808d057 Django 1.7 no run on Python 2.6. Exclude tests. 2014-09-16 22:38:56 -04:00
Chad Shryock d0fe45242b Okay. Now I think Travis will run D1.7 tests! 2014-09-16 22:35:12 -04:00
Chad Shryock 35debe3798 Test Django 1.7! 2014-09-16 22:30:27 -04:00
Chad Shryock 4dff05405b Updated the docs to be Django 1.7 friendly 2014-09-16 22:17:06 -04:00
Chad Shryock 734752c2e7 Django 1.7 upgrades 2014-09-16 22:11:13 -04:00
Chad Shryock e84a2072fc Upgraded script to be Django 1.7 friendly 2014-09-16 22:10:48 -04:00
Ben Konrath 6aa9d7cc3a Use admin class function to check permissions. 2014-09-11 15:18:40 +02:00
Chad Shryock af4843e54b Cleared up the Django 1.8 Warning messages. 2014-09-10 23:13:51 -04: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
Ben Konrath ec5ce49d81 Use consistent labels in admin. 2014-08-04 15:05:13 +02:00