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
9d00d214e1
Fix unwanted `___` handling when a fieldname starts with an underscore.
2013-07-22 10:21:00 +02:00
d16f2d7590
Add changelog entry for Grappelli fix.
2013-07-18 21:17:00 +02:00
2421f10ab5
Simplifies the two remaining templates (for grappelli support).
2013-07-18 16:38:14 +02:00
40eeb15fad
Simplifies add_type_form.html. See #38 .
2013-06-07 13:39:33 +02:00
1958146f10
Increase version and add django 1.6 support to the changelog
2013-05-24 15:37:01 -06:00
7f2111c201
assertQuerysetEquals requires an ordered queryset
2013-05-24 15:17:44 -06:00
71767431eb
Django 1.6 support
...
CHUNK_SIZE has been removed from Django, so set it ourself if it can't
be imported.
2013-05-24 15:13:34 -06:00
ff22332d2c
Remove Django 1.1 compatibility switch
2013-05-20 23:54:45 +02:00
fed810b336
Update version numbers for 0.5 release
2013-05-20 18:03:35 +02:00
83238697d2
Setup.py: update trove classifiers, read version from code.
2013-05-20 17:12:38 +02:00
4d7d33ed0d
Port new code to Python 3 as well, fix six.with_metaclass() issues
...
Many thanks to @atheiste for the big porting steps!
2013-05-20 16:03:21 +02:00
cbf52a61af
Porting to Python 3.2
...
Removed compatibility_tools (because we aim to Python 2.7 and Python 3.2)
Performed 2to3 and modified
Usage of django.utils.six which adds dependency on Django >= 1.4.2
2013-05-20 16:03:21 +02:00
c933be9c24
Port documentation to Sphinx, cleanup README
2013-05-19 17:15:41 +02:00
8cf313335c
Handle stale ContentType models (no longer referring to a model)
...
This builds on top of a fix in Django 1.6, and has a workaround for
Django 1.4 and 1.5. When the base class points to a model that no longer
exists, it will be silently dropped in the polymorphic queryset results.
This behavior is identical to iterating over results when the derived
table doesn't have the object anymore.
2013-05-19 14:35:29 +02:00
8527244cb3
Bumped versio to .dev0
2013-04-10 14:23:29 +02:00
7d562511ba
Version 0.4.2 proper
2013-04-10 14:18:55 +02:00
9b9838116d
Bumped version to 0.4.2
...
Previous verison had a broken setup.py
2013-04-10 14:15:05 +02:00
3a29da5133
Bumped version to 0.4.1
2013-04-10 14:11:06 +02:00
e38b7002f4
Merge branch 'master' of github.com:chrisglass/django_polymorphic
2013-04-10 14:10:15 +02:00
9c5c6c5136
Made the version number logic saner
2013-04-10 14:09:46 +02:00
4106ad7296
Apply list filter in example app
2013-04-08 00:37:51 +02:00
a214cd58f7
Adds admin list filter for polymorphic child models.
2013-04-08 00:35:55 +02:00
04dce421e5
Fixes PolymorphicQuerySet for django 1.6
...
QuerySet.dup_select_related has been removed.
2013-04-08 00:35:22 +02:00
bb0a4daddc
Optimize transmogrify() function, assign __class__ instead.
2013-04-08 00:32:06 +02:00
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
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
1a6f3a45e5
Handle non-distinct results from base object query
2013-04-08 00:32:06 +02:00
ea9cb91e78
Rename variables in polymorphic/query.py for clarity
...
(split from previous commit by @jedediah)
2013-04-08 00:32:06 +02:00
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
58c4f6f697
Optimization - don't do extra queries for proxy models
2013-04-08 00:05:21 +02:00
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
e2cfbf3898
Support proxy models (still requires one query per proxied model, not optimal)
2013-04-07 23:36:09 +02:00
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
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
ca4067e279
Add proxy model test that fails in Django 1.5
2013-04-05 17:36:50 +02:00
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
e411660b80
Tests: fix missed error in last commit
...
(cannot amend, already pushed for review)
2013-04-05 12:01:44 +02:00
ebced5f4eb
Tests: make old code more readable
2013-04-05 11:45:07 +02:00
7ca328f9e4
Tests: auto removed unused imports
2013-04-05 11:39:57 +02:00
2d83124f51
Tests: remove Django 1.1 compatibility check
2013-04-05 11:38:56 +02:00
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
32426aa41a
Use self.assertEqual() in tests instead of assert statement.
2013-04-05 09:54:48 +02:00
a6f8429aae
django.conf.urls.defaults is deprecated; use django.conf.urls instead
2013-04-04 23:41:07 +03:00
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
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
8e4697c741
Port regression doctest to unit test.
2013-03-18 22:33:55 +01:00
dc6f41c7e9
Update URLs to github hosted webpage.
2013-03-18 21:27:23 +01:00
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
b718acf005
Update db_type method for Django >= 1.4 DB settings format.
2013-03-18 20:50:45 +01:00
1ef9e068df
Import settings in tests from django.conf.
2013-03-18 20:47:56 +01:00
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
f687dc18b1
SQL optimization, avoid query in pre_save_polymorphic()
...
This query is visible in the django-debug-toolbar POST redirect page
2012-11-15 10:42:02 +01:00
0d5f2fd943
Change the child model registration to fix raw_id_fields.
...
As discovered in django-polymorphic-tree and django-fluent-pages,
the raw_id_fields didn't work in Django 1.4 because the fields actively
check which models are actually registered in the admin site.
Hence, the parent admin site _registry is inserted in the child admin as
well. This also completely moves the initialisation of the child admin
into this class, using a `get_child_models()` function,
akin to the static `child_models` attribute.
2012-07-24 21:50:52 +02:00
0b608cc67e
Minor extension: allow apps to override the type label in the add form easily
...
When overriding apps, this turns out to be a very useful feature to
have.
2012-07-18 00:51:34 +02:00
8d426d9243
Remove abc marker because methods are no longer abstract
2012-07-13 18:29:02 +02:00
b2e308d30c
Improve PolymorphicParentAdmin, simplify, fix templates
...
During the development of django-polymorphic-tree it was discovered that
the PolymorphicParentModelAdmin could actually be made much simpler.
It features a `child_models` attribute now, so there is very little code
needed to actually implement a polymorphic admin now.
Also found various issues which are together fixed in this commit for
pulling.
2012-07-13 16:01:58 +02:00
2e76811adb
Adding PolymorphicChildModelAdmin to __all__ as well
2012-07-05 23:27:34 +02:00
5d65bf4bbc
Added polymorphic admin interface
...
Extracted from django-fluent-pages, ready for other apps too.
The polymorphic admin is implemented via a parent admin for the base
model, and separate admin interfaces for the child models.
The parent model needs to inherit PolymorphicParentModelAdmin,
and override `get_admin_for_model()` and `get_child_model_classes()`
to find the child admin interfaces.
The derived models have their own `ModelAdmin` class, which inherits
from `PolymorphicChildModelAdmin`. The parent admin redirects it's
change and delete views to the child admin.
By adding `polymorphic` to the INSTALLED_APPS, the breadcrumbs will be
fixed as well, to remain unchanged between the child applications.
2012-07-05 23:16:46 +02:00
870091c13f
Explicit is better than implicit
2012-01-09 16:47:59 +01:00
f987818fe4
PEP 8 cleaning
...
Conflicts:
polymorphic/__init__.py
polymorphic/polymorphic_model.py
2011-12-20 18:59:50 +00:00
c9922d8987
PEP 8 cleaning
2011-12-20 18:59:50 +00:00
bb06d6d12b
Some more PEP 8 cleaning
2011-12-20 18:59:25 +00:00
dfc8eff1e1
Not using attrs when getting the first user defined manager.
2011-12-09 15:22:38 +08:00
c7cbfc0e23
Removed dead imports.
2011-05-19 15:16:39 +02:00
10b8901088
Edited polymorphic/showfields.py via GitHub
2011-05-19 06:08:39 -07:00
30f11a35d7
Edited polymorphic/query_translate.py via GitHub
2011-05-19 06:07:25 -07:00
6f8e31222d
PEP-8, it's a thing!
2011-05-19 06:05:49 -07:00
ba2cb60c9d
Edited polymorphic/polymorphic_model.py via GitHub
2011-05-19 06:04:23 -07:00
fabae70ed4
protip: after a colon in python, HIT THE ENTER KEY!
2011-05-19 06:02:53 -07:00
f42c58c0d4
it's python, not javascript!
2011-05-19 06:01:07 -07:00
2c47db8fcc
Fixed github issue 15 (query result incomplete with inheritance). Thanks to John Debs.
2011-01-24 17:03:23 +01:00
3cc7d483c1
minor additions in base.py
2011-01-24 16:45:58 +01:00
4a4cfd82a2
translate_polymorphic_Q_object: fixed test case, and made the function a member of PolymorphicObject.
...
Minor test fixes: warnings fixed, test_tool.py renamed as it's no test
2010-11-12 07:19:23 +01:00
f78b27dc1a
updated docs, tests, misc
2010-11-02 12:21:46 +01:00
52f32c1fc3
improved showfields.py for better and more precise output, updated tests
2010-11-02 12:21:46 +01:00
a4ac6cc91d
fix object retrieval problem occuring with some custom primary key fields
...
+ added UUIDField as test case
2010-11-02 12:21:22 +01:00
6befe6c733
added "queryset.get_real_instances()" usage, added testcase
2010-11-02 12:10:02 +01:00
8c3df56cb6
non_polymorphic() queryset member function added
2010-10-23 12:22:13 +02:00
19adbdaf2c
extra(): Re-implemented. Now is polymorphic (nearly) without restrictions.
...
Added test cases + docs.
2010-10-23 11:52:04 +02:00
6c8d28cbbc
extra(): throw error if unsupported argument is encountered, support 'params' argument, special case Django 1.1
2010-10-22 13:37:26 +02:00
486a579ac7
Make .extra() only disable polymorphic query if an arg that is currently
...
not handled is actually used. I.e. if all args are supported, then
do polymorphic query by default.
2010-10-22 13:35:50 +02:00
b2357592cb
make sure 'base_manager is not inherited (but managed by Django instead).
...
(This seems more correct but it doen't seem to make any difference.)
Also added related test cases.
2010-10-22 13:35:39 +02:00
6628145af7
removed __getattribute__ hack from PolymorphicModel.
...
A somewhat cleaner solution is now used (through __init__) which
also completely removes the performance impact of __getattribute__.
2010-10-20 09:31:42 +02:00
a87481b8b5
polymorphic_dumpdata management command functionality removed;
...
the regular Django dumpdata command now automatically works correctly
for polymorphic models and all Django versions
(this is handled by PolymorphicModelBase now).
Testing for dumpdata has been added.
2010-10-20 09:31:42 +02:00
f05b854a54
make PolymorphicQuerySet.get_real_instances() an official part of the API
2010-10-20 09:31:42 +02:00
b1905026bc
Documentation updated.
...
Test_all_versions script added.
Some minor misc changes.
Added polybench.
2010-10-20 09:31:36 +02:00
c10ff1650b
added translate_polymorphic_Q_object
2010-10-19 21:28:33 +02:00
01bdb2f9b0
- renamed ShowField* to ShowFieldType, ShowFieldContent, ShowFieldTypeAndContent, in order to reflect better what they do.
...
- by default, django_polymorphic's pretty printing of querysets/objects (via ShowField*) is not used anymore
- ShowField mixins now also show the annotations (after the regular fields, prepended by "Ann:")
- cleaned up implementation.
2010-10-19 21:28:33 +02:00
50b54f5aca
removed requirement for primary key to be an IntegerField.
2010-10-14 19:14:58 -07:00
116e2af08b
IMPORTANT: import path changed, it's now: "from polymorphic import PolymorphicModel, ..."
...
- added python2.4 compatibility. Contributed by Charles Leifer. Thanks!
- general reorganization of the code - there is no single polymorphic.py module anymore,
so d-p now needs to be installed as a regular Django app
- polymorphic.VERSION/get_version added
- version numbering started: V0.5 beta
2010-02-22 16:16:00 +01:00
e6c1e7ec6e
fix "...has no attribute 'sub_and_superclass_dict'". Thanks to Mattias Brändström.
...
this occurred if a subclass defined __init__ and accessed class
members before calling the superclass __init__
(__getattribute__ had a problem, as "sub_and_superclass_dict" was set in __init__).
2010-02-18 20:18:49 +01:00
7e584632b8
fix unnecessary field-name/model-name conflicts (i.e. field_name == model_name.lower() )
...
=> __init__ + __getattribute__ now handle only the Django inheritance
references that are needed ('modela_ptr', 'modelc' etc.), avoiding
unnecessary conflicts with field names.
2010-02-18 20:05:17 +01:00
2795f7acd5
some doc + minor code updates (__repr__ + Show... mixins)
2010-02-18 20:04:38 +01:00
2fcb7fba1a
queryset order_by method added, testcase, docs
2010-02-04 16:38:58 +01:00
b4aeae417e
queryset values(), values_list(), distinct() documented; defer(), only() allowed (but not yet supported)
2010-02-04 16:14:10 +01:00
c10577c32f
queryset aggregate() and extra() methods implemented, testcases, docs
2010-02-04 15:28:55 +01:00
9e7a78a8cb
queryset annotate() method implemented, and testcase
2010-02-04 15:28:55 +01:00
a99a3b5bfc
fix remaining potential accessor name clashes (but this only works with Django 1.2+, for 1.1 no changes). Thanks to Andrew Ingram.
2010-02-04 15:28:49 +01:00
ecaed2a71f
fixed use of 'id', replaced with 'pk'
2010-02-04 15:13:44 +01:00
2e17a184c0
fix select_related bug for objects from derived classes (till now sel.-r. was just ignored)
2010-02-04 15:13:44 +01:00
2a740e9b10
doc- and minor code updates
2010-02-04 15:13:33 +01:00
c7ac78e08d
Fixed ContentType related field accessor clash (an error emitted by model validation),
...
by adding related_name to the ContentType ForeignKey. Thanks to Andrew Ingram.
This happened if a polymorphc model used a ContentType ForeignKey.
Plus minor documentation updates.
2010-01-30 14:15:52 +01:00
8bdda93e76
Restructured django_polymorphic into a regular add-on application.
...
This is needed for the management commands, and also seems
to be a generally good idea for future viablity as well.
Also misc documentation updates.
2010-01-29 13:41:19 +01:00
Diederik van der Boor
Evan Borgstrom
hottwaj
Bertrand Bordage
Gavin Wahl
Tomas Peterka
Chris Glass
floppya
Jedediah Smith
Julian Wachholz
Ben Konrath
Jonas Obrist
German M. Bravo
Martin Brochhaus
Chris Glass
Bert Constantin
Abel Daniel
mathieusteele