Commit Graph

249 Commits (c3f32a14682839ac1e8d627c675846d2b288a0e4)

Author SHA1 Message Date
Hugo Osvaldo Barrera fb32b97b37 Remove obsolete compatibility code comment 2015-12-16 10:31:36 -03:00
Hugo Osvaldo Barrera e73a4662c3 Prevent infinite redirection on django1.9
See here[1] as to why this is an issue, and why we can skip the avoided
code on django>=1.9.

[1]: https://docs.djangoproject.com/en/1.9/releases/1.9/#django-contrib-admin
2015-12-16 10:31:36 -03:00
Jonas Haag 6cf187b2de Fix Django < 1.8 compatibility 2015-12-16 10:31:36 -03:00
Jonas Haag 24e6b21204 Fix a handful of warnings and remove some unused compatibility code 2015-12-16 10:31:36 -03:00
Hugo Osvaldo Barrera adcad20b48 Update all tests (and runtests.py) 2015-12-16 10:31:36 -03:00
Hugo Osvaldo Barrera b996d1c377 Avoid broken references to declared_fieldset
Check if this attribute exists first, since it does not in recent django
versions.
2015-12-16 10:31:33 -03:00
Hugo Osvaldo Barrera ad5ce60158 Remove reference to obsolete request.REQUEST 2015-10-21 22:27:00 -03:00
Hugo Osvaldo Barrera 31bfe8d1e7 Remove deprecated django.conf.urls.patterns 2015-10-21 22:18:21 -03:00
Hugo Osvaldo Barrera c48d4f589b Don't import models and managers in __init__
This is deprecated as of django 1.8, and does not work as of django 1.9.
2015-10-21 22:11:06 -03:00
Gavin Wahl 0c940bd795 SingleRelatedObjectDescriptor was renamed in Django 1.9 2015-10-13 13:22:13 -06:00
Gonzalo Bustos 83eec48d27 add spanish translation 2015-10-12 11:44:01 -03:00
Diederik van der Boor c8973d1fba Fixed Python 2.6 tests, and fixed tox.ini from PR #162 for python 3 2015-10-01 14:35:34 +02:00
Diederik van der Boor ce4b9348ec Bump version to 0.7.2 to release a few minor bugfixes 2015-10-01 14:26:28 +02:00
Diederik van der Boor 2ffbd51844 Added as_manager() support for querysets 2015-10-01 14:26:28 +02:00
Diederik van der Boor d85664f0b7 Optimize PolymorphicModel attribute access, only use __getattribute__ hack when needed. 2015-10-01 14:03:33 +02:00
Diederik van der Boor fdf905d91b Merge pull request #156 from svleeuwen/patch-1
Fix Pickle exception when polymorphic model is cached
2015-10-01 14:02:12 +02:00
Tai Lee bcc39a9086 Raise Http404 if object does not exist. 2015-09-22 09:55:03 +10:00
Sander van Leeuwen ed55ceb7fa Fix Pickle exception when polymorphic model is cached
fixes issue #155
2015-09-04 16:51:22 +02:00
Diederik van der Boor 1979ee6079 Remove unused import after merging #139 2015-08-04 16:13:06 +02:00
Martin Maillard 941e447ed0 Use parent admin site class for child admin site
Using the ``AdminSite`` class directly can cause issues when the parent
model is registered with a custom admin site class.
2015-06-08 14:04:26 +02:00
Diederik van der Boor 7a29c3972c Bump version to 0.7.1 2015-04-30 11:40:14 +02:00
Diederik van der Boor 1ff5f148b6 Fixed Django 1.8 support for related field widgets.
The RelatedFieldWidgetWrapper tries to resolve the "change" url with
"__fk__" as ID value, which broke with our strict pk_regex
2015-04-30 11:39:13 +02:00
Diederik van der Boor 9d68dee7dd __version__.py: reference PEP 440 instead. 2015-04-30 11:35:34 +02:00
Diederik van der Boor 07e1ff90a8 Bump versions to 0.7 2015-04-08 14:08:47 +02:00
Diederik van der Boor 5f4e6e18ba Fix missing import 2015-04-08 13:49:10 +02:00
tyaslab 135feaf905 fixed 'source_expressions'
(cherry picked from commit 9a34a2a5017499bb12512b2387de49aa2c40fc88)
2015-04-08 13:44:35 +02:00
Diederik van der Boor 640461216b Merge pull request #127 from warrd/master
Issue with related_name in polymorphic_ctype field
2015-04-08 13:40:28 +02:00
Diederik van der Boor 9ef7ccb65e Fixed long/int issue for Python 3.
This closes #126 with a fix that won't degrate Python 2 code.
2015-04-08 13:38:26 +02:00
Diederik van der Boor 9efc5cfcb2 Merge pull request #124 from benkonrath/fix-admin-500-error
Don't remove '/' from id when it's not in the path
2015-04-08 13:35:25 +02:00
Diederik van der Boor 17c2445e39 Merge pull request #120 from theatlantic-pr/cleanup-test-noise
Conflicts:
	polymorphic/tests.py
2015-04-08 13:33:54 +02:00
Diederik van der Boor 2b78b92cc6 Merge pull request #121 from luisza/master
Fixed preserved filter for django 1.7
2015-04-08 13:25:17 +02:00
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
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 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 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 c9e232a79b Bump version to 0.6 2014-10-14 16:29:30 +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 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 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 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 734752c2e7 Django 1.7 upgrades 2014-09-16 22:11:13 -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
Ben Konrath ec5ce49d81 Use consistent labels in admin. 2014-08-04 15:05:13 +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
Kevin Armenat 029bb2ae1a added django < 1.6 compatibilty for permission codename generation 2014-07-29 11:15:38 +02:00
Kevin Armenat 6ce390f777 added permission check for all child types 2014-07-29 09:47:23 +02:00
Marius Lueck d755d257ef Changed super call of get_queryset to queryset 2014-07-25 22:55:58 +02:00
Marius Lueck fb1795ad12 Fixed compatibility with django 1.8 2014-07-25 11:48:07 +02:00
Diederik van der Boor 831075c3c7 bump version to 0.5.6 2014-07-21 11:42:26 +02:00
Jacob Rief 62e7940c33 Fixed: adding polymoric model with django-parler did not work 2014-07-18 18:26:51 +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
Andrew d8d6f07f71 Adds pk_regex attr in PolymorphicParentModelAdmin 2014-07-08 18:05:04 +03: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
John Furr 8687e135a3 Test that proxy models derived from PolyMorphicBase classes
can call get_real_instance() and get_real_instance_class()

Includes:
def test_proxy_get_real_instance_class(self):
2014-04-29 07:35:27 -04:00
John Furr f85ebdd9e6 Fix get_real_instance_class for proxy models 2014-04-28 11:32:30 -04:00
utapyngo e1a4ba80e9 Fixed typo: CopntentType 2014-04-18 19:17:23 +07: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 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
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 4be6d42fad Optimize NewBase test of six.with_metaclass() for Django 1.5+ 2014-02-13 10:43:33 +01:00
Bertrand Bordage ed708c69c6 Adds a french translation. 2013-11-29 18:18:55 +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 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 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
Bertrand Bordage 2421f10ab5 Simplifies the two remaining templates (for grappelli support). 2013-07-18 16:38:14 +02:00
Bertrand Bordage 40eeb15fad Simplifies add_type_form.html. See #38. 2013-06-07 13:39:33 +02:00