a5e348ffb9
Disable the old _default_manager and _copy_to_model() fiddling.
...
This no longer works on Django 1.10, which has a new way to find the
default manager
2016-08-05 17:21:18 +02:00
ac98a8123a
Raise ParentAdminNotRegistered instead of KeyError
2016-07-08 12:06:04 +02:00
b1f037dd68
Merge pull request #221 from Corvia/master
...
#220 Pass hints to returned queryset in PolymorphicManager.get_queryset.
2016-06-15 10:38:10 +02:00
0edd0d4acd
fix redirects after child model add/change in PolymorphicChildModelAdmin
2016-06-14 19:17:04 +03:00
b254c3fc97
#220 Skip `test_save_to_non_default_database` on Django 1.4.
2016-06-13 09:00:48 -05:00
c1ee5aad0b
Improve #215 to handle cases where the real_admin points back to self.
...
When the base model also serves as child model, the flow no longer
points to the child admin, but returns `self` instead. Either every user
of `_get_real_admin()` should detect this, or we return the super method
as convenience.
2016-06-13 10:53:29 +02:00
8c42893abd
docs start for formset/inline support
2016-06-13 10:18:18 +02:00
78fe87d89c
#220 Fix compatibility with Django < 1.7.
2016-06-12 23:23:44 -05:00
f1735a8bea
#220 Pass hints to returned queryset in PolymorphicManager.get_queryset.
2016-06-12 22:15:37 -05:00
a07ce7260c
Upstream support for polymorphic formsets and and inline models.
...
Originally written in django-fluent-contents to support polymorphic generic inlines;
72d816b8bb
2016-06-10 14:30:51 +02:00
2a599b5f99
Convert `admin.py` into a package.
...
Clears up the code and prepare to receive more changes for formset support.
2016-06-10 14:25:06 +02:00
226e5689bd
Merge pull request #215 from skirsdeda/master
...
Admin refactoring (based on #58 )
2016-06-10 14:09:24 +02:00
0ce882dd7b
Make the Django 1.6 support more explicit for PR #218
2016-06-06 15:26:48 +02:00
d714040331
Adding < django 1.6 flags in code and test
2016-06-03 12:45:21 -04:00
a16345874e
Issue #213 : Don't modify Q passed in as arguments
2016-06-02 01:10:43 -04:00
4aece2b5d3
#216 Use self._state.db instead of `using` kwarg in model methods.
...
Thanks to @vdboor for the suggestion.
Also:
- Add missing `using` kwargs in query_translate functions.
- Add a couple unit tests for non-default database functionality.
2016-05-30 18:55:03 -05:00
2f11cb6ffd
#216 Specify `using` kwarg in get_real_instance method calls.
2016-05-29 14:05:45 -05:00
343aa41ec1
#216 Allow ContentType queries to be performed on non-default databases.
2016-05-27 20:35:39 -05:00
2028ecda1e
Correct comment in admin.py
2016-05-24 05:06:50 -04:00
e33cf73fb2
Admin refactoring based on #58 (related field to child models and other fixes) but with backwards compatibility
2016-05-20 06:50:33 -04:00
120f124b91
Issue #200 - Exclude super-class from proxy model query sets
...
These changes prevent the query sets on 'proxy' models from including
the items from the 'super-class'.
2016-05-04 15:52:44 +02:00
75646f1f24
Bump to 0.9.2
2016-05-04 11:29:53 +02:00
ed64ed283f
Resolved deprecation warning for Django 1.10
2016-05-04 11:29:53 +02:00
b8c8ff7bfa
Test that expressions are supported
2016-04-26 20:12:04 +02:00
5aa15b226e
Improve code flow for Django 1.7/1.8 in patch_lookup args
2016-03-11 17:16:05 +01:00
88922d7d5e
Fix error when using `date_hierarchy` field in the admin
...
Closes : #201
2016-03-11 17:13:09 +01:00
6319dabcef
Fix trailing whitespace in query.py
2016-03-11 17:13:01 +01:00
84a29db2f6
Bump version to 0.9.1
2016-02-18 18:28:48 +01:00
ccda52d91e
Fixed the breadcrumb of the object_history template.
...
NOTE: this could conflict with projects that use django-reversion,
if the `VersionAdmin` is the last in the inheritance chain.
2016-02-18 18:17:08 +01:00
88bb23b506
Fix deferred loading of 'pk' field
2016-02-18 13:14:49 +01:00
46e41a6c1c
Fix changeform_view() redirection to the child admin site.
...
This method is normally called from `add_view()` and `change_view()`.
However, some third party modules (such as django-reversion) call this
method directly. By redirecting those calls to the child admin, their
views also display the proper admin views.
2016-02-17 14:49:40 +01:00
65de1f74ab
Added PolymorphicManager.from_queryset() to properly set the queryset
2016-02-17 12:36:48 +01:00
3bab378b25
Bump version to 0.9
2016-02-17 12:28:01 +01:00
14a5417891
Added yet another hack to keep the child admin site happy.
...
This really validates a different solution to the child admin layout,
e.g. by registering the models in the regular admin site.
2016-02-17 12:27:33 +01:00
efdebb1575
Fix missing redirect for the history_view.
...
This fixes django-reversion, and partally django-reversion-compare.
2016-02-17 11:20:11 +01:00
01a35cfe95
Fix Django 1.9 handling of custom URLs.
...
The new change-URL redirect overlapped any custom URLs defined in the child admin.
This makes sure the redirect doesn't interfere with custom URLs.
2016-02-17 11:20:11 +01:00
4277c148aa
Merge pull request #161 from theatlantic/pr-add-deferred-fields
...
Add support for qset.only() and qset.defer()
2016-02-17 11:14:48 +01:00
9b7c2d72b7
Added test cases for complex expressions in aggregate/annotate
2016-01-21 15:32:28 +01:00
c5d4687bb9
Support Django 1.8 complex expressions on aggregate/annotate
2016-01-21 13:21:21 +01:00
6df1403de5
Add support for qset.only() and qset.defer()
2016-01-04 00:36:48 -05:00
b17aa58ad9
Merge remote-tracking branch 'upstream/master' into allow_extra_manager
2015-12-29 17:49:09 -03:00
e9f549758f
Bump version to 0.8.1
2015-12-29 14:55:25 +01:00
b0657ef9c7
Fix reverse relation support for ___ filter operator
2015-12-29 14:52:58 +01:00
009069a32b
Avoid auto-proxying all methods to the queryset.
...
This is unwanted behavior, and django provides much better methods for
it instead. (PolymorphicQuerySet.as_manager() / PolymorphicManager.from_queryset()
2015-12-28 17:10:58 +01:00
9e2c11beb8
Replace __version__.py with __init__.py
...
Also fixes reporting in sentry.
2015-12-28 17:10:42 +01:00
5191b6c130
Also remove showfields imports from __init__.py
...
If we're to cause pain, let it be once.
2015-12-28 17:10:42 +01:00
50f21dfa43
Rename manager.py => managers.py for consistency
2015-12-28 17:10:42 +01:00
07242d210f
Fix "Model" __ "_field" query support
...
Broken by 24e6b21204
2015-12-28 16:19:27 +01:00
b7431b2d06
Fix PEP8 block comment issues (E265)
2015-12-28 15:16:42 +01:00
aaf06c71a5
Fix PEP8 whitespace issues
...
autopep8 -r polymorphic/ example/ -i
--select=E112,E113,E115,E116,E122,E123,E125,E127,E128,E201,E202,E203,E211,E225,E226,E227,E228,E231,E251,E261,E262,E271,E272,E273,E274,E301,E302,E303,E304,E309,E711,E713,W291,W293,W391
--exclude migrations,south_migrations
(line conditiation fixes: E123,E125,E122,E127,E128)
2015-12-28 15:16:29 +01:00
f419e37ab3
Allow to set a 'extra' custom manager withut override the _default_manager
2015-12-23 21:07:44 -03:00
4da67a0fb6
Fix an issue with '.values()' queries
2015-12-16 10:31:36 -03:00
0b87a5ecc8
Fixed a Python >= 3.7 incompatibility (see PEP 479)
2015-12-16 10:31:36 -03:00
ee2e0a95ea
Extend comment about admin URL patching
2015-12-16 10:31:36 -03:00
fb32b97b37
Remove obsolete compatibility code comment
2015-12-16 10:31:36 -03:00
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
6cf187b2de
Fix Django < 1.8 compatibility
2015-12-16 10:31:36 -03:00
24e6b21204
Fix a handful of warnings and remove some unused compatibility code
2015-12-16 10:31:36 -03:00
adcad20b48
Update all tests (and runtests.py)
2015-12-16 10:31:36 -03:00
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
ad5ce60158
Remove reference to obsolete request.REQUEST
2015-10-21 22:27:00 -03:00
31bfe8d1e7
Remove deprecated django.conf.urls.patterns
2015-10-21 22:18:21 -03:00
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
0c940bd795
SingleRelatedObjectDescriptor was renamed in Django 1.9
2015-10-13 13:22:13 -06:00
83eec48d27
add spanish translation
2015-10-12 11:44:01 -03:00
c8973d1fba
Fixed Python 2.6 tests, and fixed tox.ini from PR #162 for python 3
2015-10-01 14:35:34 +02:00
ce4b9348ec
Bump version to 0.7.2 to release a few minor bugfixes
2015-10-01 14:26:28 +02:00
2ffbd51844
Added as_manager() support for querysets
2015-10-01 14:26:28 +02:00
d85664f0b7
Optimize PolymorphicModel attribute access, only use __getattribute__ hack when needed.
2015-10-01 14:03:33 +02:00
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
bcc39a9086
Raise Http404 if object does not exist.
2015-09-22 09:55:03 +10:00
ed55ceb7fa
Fix Pickle exception when polymorphic model is cached
...
fixes issue #155
2015-09-04 16:51:22 +02:00
1979ee6079
Remove unused import after merging #139
2015-08-04 16:13:06 +02:00
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
7a29c3972c
Bump version to 0.7.1
2015-04-30 11:40:14 +02:00
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
9d68dee7dd
__version__.py: reference PEP 440 instead.
2015-04-30 11:35:34 +02:00
07e1ff90a8
Bump versions to 0.7
2015-04-08 14:08:47 +02:00
5f4e6e18ba
Fix missing import
2015-04-08 13:49:10 +02:00
135feaf905
fixed 'source_expressions'
...
(cherry picked from commit 9a34a2a5017499bb12512b2387de49aa2c40fc88)
2015-04-08 13:44:35 +02:00
640461216b
Merge pull request #127 from warrd/master
...
Issue with related_name in polymorphic_ctype field
2015-04-08 13:40:28 +02:00
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
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
17c2445e39
Merge pull request #120 from theatlantic-pr/cleanup-test-noise
...
Conflicts:
polymorphic/tests.py
2015-04-08 13:33:54 +02:00
2b78b92cc6
Merge pull request #121 from luisza/master
...
Fixed preserved filter for django 1.7
2015-04-08 13:25:17 +02:00
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
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
90933184e9
Modified polymorphic_ctype related_name to be valid
2015-03-11 16:33:19 +00:00
2a8a16edb8
Don't remove '/' from id when it's not in the path
2015-03-02 11:24:50 +01:00
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
1be1fc02db
Fix missing items bug in qset on child of PolymorphicModel w custom pk
...
fixes #66
2015-01-31 17:11:03 -05:00
ad63c6a442
Test missing items bug in qset on child of PolymorphicModel w custom pk
...
refs #66
2015-01-31 17:10:57 -05:00
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
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
d56d9bfd15
Add tests for instance._default manager. Refs #96
2015-01-31 13:17:56 -05:00
469d063cc9
Django 1.8 alpha support
2015-01-28 00:41:34 +01:00
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
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
4d526d8780
Simplify selecting get_queryset() vs get_query_set() -> use self.all()
2014-12-30 13:25:22 +01:00
4bddac7c70
Fix validate_model_fields(), caused errors when metaclass raises errors
2014-10-29 18:58:54 +01:00
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
6d043d35d2
Bump version to 0.6.1 already
2014-10-14 17:32:40 +02:00
948749dbdb
Remove Django 1.7 warnings
2014-10-14 17:30:25 +02:00
c9e232a79b
Bump version to 0.6
2014-10-14 16:29:30 +02:00
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
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
ff6b09e7c7
admin: split get_queryset() / queryset() methods.
...
avoid calling loops due to some inherited classes
2014-09-22 15:14:32 +02:00
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
ea160669cf
Merge pull request #91 from mlsen/master
...
Django 1.8 compatibility
2014-09-22 14:51:03 +02:00
cc53b3003e
Remove exception.
2014-09-17 08:30:12 -04:00
b9654b7138
Missing return.
2014-09-17 08:26:28 -04:00
734752c2e7
Django 1.7 upgrades
2014-09-16 22:11:13 -04:00
6aa9d7cc3a
Use admin class function to check permissions.
2014-09-11 15:18:40 +02:00
af4843e54b
Cleared up the Django 1.8 Warning messages.
2014-09-10 23:13:51 -04:00
ec5ce49d81
Use consistent labels in admin.
2014-08-04 15:05:13 +02:00
14df8c529e
Move the get_permission_codename import to the main code.
...
cc #93
2014-07-29 12:15:09 +02:00
029bb2ae1a
added django < 1.6 compatibilty for permission codename generation
2014-07-29 11:15:38 +02:00
6ce390f777
added permission check for all child types
2014-07-29 09:47:23 +02:00
d755d257ef
Changed super call of get_queryset to queryset
2014-07-25 22:55:58 +02:00
fb1795ad12
Fixed compatibility with django 1.8
2014-07-25 11:48:07 +02:00
831075c3c7
bump version to 0.5.6
2014-07-21 11:42:26 +02:00
62e7940c33
Fixed: adding polymoric model with django-parler did not work
2014-07-18 18:26:51 +02:00
d8b40167d3
Mention the improvements of #87 in the changelog and documentation too.
2014-07-08 17:18:07 +02:00
d8d6f07f71
Adds pk_regex attr in PolymorphicParentModelAdmin
2014-07-08 18:05:04 +03:00
8a548ca829
bump version to 0.5.5
2014-04-29 14:11:58 +02:00
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
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
f85ebdd9e6
Fix get_real_instance_class for proxy models
2014-04-28 11:32:30 -04:00
e1a4ba80e9
Fixed typo: CopntentType
2014-04-18 19:17:23 +07:00
6c58acac8d
bump version and changelog
2014-04-09 12:11:29 +02:00
35cdb7b697
Fix subclass protection when ContentType is stale
2014-04-07 14:38:34 +02:00
e8d5ce6231
Add protection against mixed up ContentType tables
2014-04-04 15:28:47 +02:00
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
08e900eb6d
Merge pull request #69 from borgstrom/django16
...
Prevent infinite recursion in Django 1.6
2014-04-03 14:24:52 +02:00
157f6b1057
Fix missing ``alters_data = True`` annotations.
2014-04-03 14:10:53 +02:00
d93add71fb
Be more specific in the condition before setting 'fields'
2014-03-13 16:50:25 -04:00
134c44bef0
Prevent infinite recursion in Django 1.6
2014-03-13 16:39:13 -04:00
02221d7d10
changed dict.iteritems() call to dict.items() for python 3 compatibility...
2014-02-19 11:05:57 +00:00
578aa8f1dd
removed pdb import which I used for testing...
2014-02-19 11:00:19 +00:00
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
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
4be6d42fad
Optimize NewBase test of six.with_metaclass() for Django 1.5+
2014-02-13 10:43:33 +01:00
ed708c69c6
Adds a french translation.
2013-11-29 18:18:55 +01:00
e1093ff1fb
Fix .non_polymorphic(), returns a copy of the queryset
...
Just like .filter() and such do.
2013-09-19 19:36:05 +02:00
61e9a8050a
Bump version to 0.5.3
2013-09-17 11:33:56 +02:00
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
e0446bd76c
Fix TypeError when ``base_form`` was not defined.
2013-09-17 10:50:46 +02:00
b622d6f6a1
Bump version to 0.5.2
2013-09-05 11:38:26 +02:00
638ecd5813
Fix admin validation errors related to additional non-model form fields.
2013-09-05 11:36:54 +02:00
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
Diederik van der Boor
Tadas Dailyda
Austin Matsick
Alex Alvarez
Andrew Dodd
NotSqrt
slide333333
Frankie Dintino
gilgamezh
Jonas Haag
Hugo Osvaldo Barrera
Gavin Wahl
Gonzalo Bustos
Tai Lee
Sander van Leeuwen
Martin Maillard
tyaslab
Nick Ward
Ben Konrath
Luis Zárate
Chris Barna
ellmetha
Chad Shryock
Kevin Armenat
Marius Lueck
Jacob Rief
Andrew
John Furr
utapyngo
Evan Borgstrom
hottwaj
Bertrand Bordage