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

779 Commits (c8463b1520f26977421fd6a6f98e3817e2dccada)

Author SHA1 Message Date
Diederik van der Boor 63c33d595a Further highlight the differences between 1.3.1 and 2.0 2018-04-16 11:56:51 +02:00
Diederik van der Boor 78e31f16e7 Reinserted v1.3.1 changelog after merging with "ours" strategy 2018-04-16 11:37:47 +02:00
Diederik van der Boor a797605853 Merge branch 'v1.3.x' 2018-04-16 11:36:38 +02:00
Diederik van der Boor 31dd8b6138 Release v1.3.1 2018-04-16 11:33:14 +02:00
Diederik van der Boor 8f7f255580 Fixed template settings in example app 
(cherry picked from commit 19497960c7)
 2018-04-16 11:33:08 +02:00
Tadas Dailyda 5fe504d40d fix detecting whether childadmin has explicitly defined fields/fieldsets 
(cherry picked from commit 180df8e98c)
 2018-04-16 11:21:51 +02:00
Tadas Dailyda d1c5845966 further childadmin fieldsets improvements 
(cherry picked from commit 15426dc695)
 2018-04-16 11:21:51 +02:00
Diederik van der Boor 9f92b0614d Fixed applabel__ModelName___field looksups 
Closes: #286
(cherry picked from commit 8f0932b71e)
 2018-04-16 11:21:51 +02:00
Diederik van der Boor ca1a982c34 Make sure reset_polymorphic_ctype() supports proxy models 
(cherry picked from commit 04b5fb423c)
 2018-04-16 11:21:51 +02:00
Diederik van der Boor 551e93c47c Fix support for proxy models in formsets and admin inlines 
(cherry picked from commit c2768f8101)
 2018-04-16 11:21:51 +02:00
Diederik van der Boor 5c0b561ba2 Add UnsupportedChildType error for formsets 
This also replaces the PolymorphicInlineModelAdmin.get_get_child_inline_instance()
and BasePolymorphicModelFormSet._construct_form() lookup with UnsupportedChildType

(cherry picked from commit cafaf95f06)
 2018-04-16 11:21:51 +02:00
Diederik van der Boor e00e6d7e39 Fix deleteText of |as_script_options 
(cherry picked from commit 9f6e0716f6)
 2018-04-16 11:21:51 +02:00
Diederik van der Boor 7de1366f6f Improve docs of PolymorphicChildModelAdmin attributes 
(cherry picked from commit c437524876)
 2018-04-16 11:21:51 +02:00
Diederik van der Boor fe7de17ecf Make the admin `base_model` setting optional. 
It can be detected using get_base_polymorphic_model()

(cherry picked from commit cf0cb2478f)
 2018-04-16 11:21:51 +02:00
Diederik van der Boor 874b60ec40 Added `get_base_polymorphic_model()` to detect the common base class for a polymorphic model. 
(cherry picked from commit 04d4181e17)
 2018-04-16 11:21:51 +02:00
Diederik van der Boor fa9612d49c Small Django 1.8/19 difference for .only() 2018-04-16 11:21:39 +02:00
trbs 1c110ae4bb fix error with .defer and child models that use the same parent 
When using .defer on a PolymorphicQuerySet with multiple childs that
subclass from the same polymorphic parent model yield an error like:

>>> Base.objects.defer('ModelY___field_y')
Traceback (most recent call last):
...
FieldDoesNotExist: ModelX has no field named 'field_y'

(cherry picked from commit 9500a21f82)
 2018-04-16 11:08:27 +02:00
Diederik van der Boor 171df51428 Ensure consistent ordering in testing reset_polymorphic_ctype 
Amends: 171d14f369
(cherry picked from commit 77797bfa12)
 2018-04-16 11:08:27 +02:00
Diederik van der Boor 467e6f517e Improve reset_polymorphic_ctype() for reliability and test it. 
This function can now be safely used on a set of models.

(cherry picked from commit 171d14f369)
 2018-04-16 11:08:27 +02:00
Diederik van der Boor db46dbb446 Also introduce a new exception type for invalid database IDs 
(cherry picked from commit 4835cd244e)
 2018-04-16 11:08:27 +02:00
Diederik van der Boor f126f5f304 Provide a better error message when polymorphic_ctype_id is Null 
refs #51, #140, #304

(cherry picked from commit fb8eed78ad)
 2018-04-16 11:08:27 +02:00
Krzysztof Nazarewski 925c4de34f `declared_fieldsets` typo fix 
(cherry picked from commit 697df65c7b)
 2018-04-16 11:08:27 +02:00
Tadas Dailyda 731fd51a67 skip manager validation on swapped models 2018-04-16 10:42:01 +02:00
Tadas Dailyda 6013de93d3 tests for abstract/swappable model initialization 
(cherry picked from commit 0fea8a4d92)
 2018-04-16 10:41:50 +02:00
Diederik van der Boor 3417d466c4
Merge pull request #345 from T4m/patch-1 
Update managers.rst
 2018-04-16 10:24:26 +02:00
Diederik van der Boor c3f07b418a
Merge pull request #343 from apirobot/django-rest-polymorphic 
Add django-rest-polymorphic to the third-party apps
 2018-04-16 10:23:56 +02:00
Diederik van der Boor 81cb2864a9
Merge pull request #344 from GeyseR/patch-1 
Fixed link to Jacob Kaplan-Moss blog post
 2018-03-14 12:08:37 +01:00
Cornut Matthieu 09c50a55c9
Update managers.rst 
The PolymorphicManager must be instanciated
 2018-03-13 17:11:24 +01:00
Sergey Fursov a6ca6b1370
Fixed link to Jacob Kaplan-Moss blog post 2018-03-13 16:23:00 +03:00
Denis Orehovsky e9b863bb9d Add django-rest-polymorphic to the third-party apps 2018-03-12 08:35:13 +03:00
Diederik van der Boor d3f044871b fix manager docs imports 
Mentioned in #61
 2018-02-19 11:06:39 +01:00
Diederik van der Boor ff57aa57a3 include test for missing Meta.manager_inheritance_from_future 2018-02-05 13:31:00 +01:00
Diederik van der Boor 78682d2022 Bump to v2.0.2 2018-02-05 13:28:40 +01:00
Diederik van der Boor ea53b995a1 Enforce `manager_inheritance_from_future` on every model 2018-02-05 13:26:54 +01:00
Diederik van der Boor a6aa95c07e Fixed internal usage of deprecated `base_objects` 
Reverted the change in f898f80594 that
also replaces the internal `base_objects` with `.non_polymorphic()`.
That also changed which querysets was used. Use a clean queryset
instead that has no select-related/prefetch information, etc.. like
previous versions did.
 2018-02-05 13:00:23 +01:00
Diederik van der Boor d36f55a58f Bump to v2.0.1 2018-02-05 10:57:52 +01:00
Diederik van der Boor c56d22b5b8 travis: use newer postgres for Django 2.0 tests 2018-02-05 10:57:52 +01:00
Diederik van der Boor 852ecf6ea9 Turn the manager inheritance error into a warning. 
Not all projects have queryset issues, for example the class could be a
leaf that doesn't get inherited further.

  class PolymorphicModel
    class ContentItem
      class TextItem   <-- gets error, but it's the leaf anyway.
 2018-02-05 10:19:18 +01:00
Diederik van der Boor f898f80594 Fixed unwanted manager replacement in Django 1.11 projects. 
Django 1.11 uses the old manager inheritance system, unless it's
overwritten with manager_inheritance_from_future. With a class layout
like:

  PolymorphicModel  (abstract)
    PolymorphicMPTTModel  (abstract)
      GenericCustomer  (concrete, has objects = ...)
        CustomerGroupBase (abstract, has objects = ...)
          Partner (concrete, no manager)
            BranchPartner  (concrete, no manager)

The last level gets a normal Django Manager instead of the polymorphic
manager. Because the PolymorphicModel had a base_objects manager, this
was typically used as _default_manager. Now that the default manager is
no longer affected, it's also easier to detect why the "objects" doesn't
get the proper manager type. Using "manager_inheritance_from_future" is
recommended instead to have both the right behavior and forward
Django 2.x compatibility.
 2018-02-04 13:22:51 +01:00
Diederik van der Boor 723c78065c PEP8 runtests 2018-01-31 22:56:05 +01:00
Diederik van der Boor d4cf32b5b6 Also show warning via coverage and travis 2018-01-31 22:52:07 +01:00
Diederik van der Boor e21843aef9 Show deprecation warnings during tests 2018-01-31 22:37:11 +01:00
Diederik van der Boor f84e732767 fixed test management commands 2018-01-22 15:22:39 +01:00
Diederik van der Boor f7c9df935f move _polymorphic_iterator to PolymorphicModelIterable as there is no second compatibility code path anymore 2018-01-22 15:22:27 +01:00
Diederik van der Boor fa3b874a54 Bumped to 2.0 2018-01-22 10:18:51 +01:00
Diederik van der Boor 9d651a1cdb Fix the add_media() hack for Django 2.0 2018-01-18 15:45:18 +01:00
Diederik van der Boor e164026b43
Merge pull request #318 from meshy/django-2.0 
Add django 2.0 support
 2018-01-18 15:43:59 +01:00
Charlie Denton ed40b9e3e2
Use assertRegex to ignore object IDs 
Sometimes the tests failed because these objects had IDs that differed
from expectations. As the IDs are not relevant to this test, I have
replaced the exact string match with a regex match that accepts any ID.
 2018-01-17 22:02:19 +00:00
Charlie Denton c3179058d3
Update trove classifiers and django requirement 2018-01-16 10:54:33 +00:00
Charlie Denton 388d0e12c0
Update docs to reflect supported django versions 2018-01-16 10:54:33 +00:00