Commit graph

383 commits

Author SHA1 Message Date
Douglas Meehan
2b089aee8d updated manager docs 2014-01-10 17:07:49 -05:00
Douglas Meehan
1cf5454ee8 added documentation about manager mixins 2014-01-10 22:01:46 +00:00
Douglas Meehan
33c600e28c edited class names 2014-01-10 16:18:10 -05:00
Douglas Meehan
9e024a14af removed trailing whitespace 2014-01-10 16:15:42 -05:00
Douglas Meehan
aaf1fc8636 changed class names to be more descriptive 2014-01-10 16:06:08 -05:00
Douglas Meehan
55a15f7e55 Update managers.py 2014-01-09 16:58:51 -05:00
Douglas Meehan
72c8f0bc18 moved get_query_set = get_queryset from the mixin to the manager 2014-01-09 21:47:46 +00:00
Douglas Meehan
c787a98f21 removed GeoDjango specific code. Abstracted all managers 2014-01-08 17:19:00 +00:00
Douglas Meehan
e7c3f6b28e edited doc string 2014-01-08 16:57:59 +00:00
Douglas Meehan
a1ffac9fa7 edited class names 2014-01-08 16:56:32 +00:00
Douglas Meehan
a1abc9bb8a edited class names 2014-01-08 16:54:41 +00:00
Douglas Meehan
b529e576ff added geo support for PassThroughManager 2014-01-08 16:46:39 +00:00
Carl Meyer
87f7209042 Bump version for dev. 2014-01-06 18:26:01 -07:00
Carl Meyer
788993f25d Update supported Django/Python versions. 2014-01-06 18:25:10 -07:00
Carl Meyer
6b4a900ca0 Bump version to 2.0. 2014-01-06 18:22:24 -07:00
Carl Meyer
5e39bcd756 Remove special support for pickling PassThroughManager; apparently unnecessary in all supported Django/Python versions. 2014-01-06 18:18:42 -07:00
Carl Meyer
32aa781dc2 Merge branch 'master' into query-set-deprecated
* master:
  Update tox.ini.
  Update runtests.py for compatibility with Django 1.7.
  Check for StatusModel field name conflicts correctly.
2014-01-06 16:06:31 -07:00
Carl Meyer
7d69dba669 Update tox.ini. 2014-01-06 16:04:15 -07:00
Carl Meyer
739e1b169a Update runtests.py for compatibility with Django 1.7. 2014-01-06 16:04:07 -07:00
Carl Meyer
8ea75e53f4 Check for StatusModel field name conflicts correctly. 2014-01-06 16:03:44 -07:00
Thomas Schreiber
910bcc7830 backwards comptatible get_queryset, for Django < 1.6 2013-12-31 17:30:11 +01:00
Thomas Schreiber
5ae92dba27 fix get_query_set deprecationwarnings 2013-12-30 21:42:52 +01:00
Carl Meyer
0ddbbff1b7 Merge pull request #98 from BME-IK/move-timestamp-docs
Move TimeStampedModel docs to models.rst
2013-12-27 10:11:22 -08:00
Őry Máté
2a965bf753 move TimeStampedModel docs to models.rst 2013-12-27 11:29:42 +01:00
Carl Meyer
ccd7086112 Merge pull request #93 from tucarga/choices-name
Added choices_name parameter to StatusField
2013-11-14 12:13:46 -08:00
Carl Meyer
70cf0466ef Merge pull request #94 from tucarga/contributing
Updated `CONTRIBUTING.rst`
2013-11-14 12:12:26 -08:00
Alejandro Varas
ae13fe2f41 Updated CHANGES.rst 2013-11-14 16:39:19 -03:00
Alejandro Varas
d2e2f51f9a Updated CONTRIBUTING.rst 2013-11-14 16:27:32 -03:00
Alejandro Varas
452ac5cd21 Added choices_name parameter to StatusField 2013-11-14 16:12:31 -03:00
Carl Meyer
3b5c99b093 Merge pull request #89 from kezabelle/bugfix/named_onetoone
Allow InheritanceManager to work with manually specified OneToOnes
2013-10-26 16:59:23 -07:00
Keryn Knight
dd469a0e8f Added test to explicitly demonstrate manually defined related_name
usage works in select_subclasses going forwards.

Also fixed fragility of 2 tests introduced in ae71f9080e
2013-10-26 16:34:21 +01:00
Keryn Knight
a270eef1fd Fixed #59 - manually setting the parent relation
via a OneToOne should present the same behaviour
as the implicit ptr Django generates on
subclasses.

Thanks to Eran Rundstein for reporting the issue
and proposing the fix.
2013-10-26 15:53:15 +01:00
Keryn Knight
262455a60d Update model tests to include our new InheritanceManagerTestChild3
as part of the emulation of select_subclasses.

Test still fails because of #59.
2013-10-26 15:50:19 +01:00
Keryn Knight
ae71f9080e Tests for #59 - a manually specified OneToOne should behave
the same as an implicit one.
2013-10-26 15:44:01 +01:00
Carl Meyer
06d3b7a5cf Tweak line-continuation indentation. 2013-10-22 12:23:16 -06:00
Carl Meyer
65427407d6 Update changelog. 2013-10-22 12:15:17 -06:00
Carl Meyer
0cee79ecd7 Merge pull request #79 from kezabelle/feature/model_subclasses
Implementation for selecting subclasses by Model class rather than string.
2013-10-22 11:12:48 -07:00
Keryn Knight
1de58474c0 Implemented #44 - passing Model classes to InheritanceManager's select_subclasses 2013-10-21 21:47:58 +01:00
Carl Meyer
907014dab9 Flesh out the backwards-incompatibility note about indexing Choices. 2013-10-11 13:32:07 -06:00
Carl Meyer
06dddbfa82 Use full name in AUTHORS. 2013-10-11 13:29:47 -06:00
Carl Meyer
1d3af52456 Update AUTHORS and changelog. 2013-10-11 13:25:37 -06:00
Carl Meyer
79ca819736 Merge branch 'fix-choices-deepcopy'
* fix-choices-deepcopy:
  Added deepcopy test
  Implemented __deepcopy__ to avoid infinite recursion in __getattr__ while deepcopying a Choices instance
2013-10-11 13:24:13 -06:00
Carl Meyer
3211c92a4d Merge branch 'master' into fix-choices-deepcopy
* master: (23 commits)
  only accepting iterables to the when field
  adding 'when' parameter to MonitorField
  Update AUTHORS and changelog.
  Add test to verify get_subclass() on QuerySet
  Refactor to make sure get_subclass() is on QuerySet
  Fixed indexing into Choices so its useful.
  Fix bug with child/grandchild select_subclasses in Django 1.6+; thanks Keryn Knight.
  fixed code block
  Bump version for dev.
  Bump version for 1.5.0 release.
  Add option-groups capability to Choices.
  Add Changelog note about Choices equality/addition.
  Added tests to improve coverage
  Alphabetised authors
  Removed redundant inequality method on Choices
  Moved documentation for Choices field to the right place
  Corrected typo
  Added self to Authors file
  Added equality methods to Choices objects, and overrode + for Choices for easy concatenation with other Choices and choice-like iterables. Also wrote tests for them, and extended the readme to reflect this
  Fix typo noted by @silonov
  ...

Conflicts:
	model_utils/choices.py
2013-10-11 13:23:56 -06:00
Carl Meyer
55ac3ddb3c Merge pull request #85 from filipeximenes/master
Adding 'when' parameter to MonitorField
2013-10-11 12:02:26 -07:00
Filipe Ximenes
3d82ec89b4 only accepting iterables to the when field 2013-10-11 08:24:00 -03:00
Filipe Ximenes
e3450977bd adding 'when' parameter to MonitorField 2013-10-11 00:08:38 -03:00
Carl Meyer
d7f7a54e77 Update AUTHORS and changelog. 2013-10-08 11:15:01 -06:00
Carl Meyer
12906a1ed6 Merge pull request #82 from tswicegood/fix-get_subclass
Refactor to make sure get_subclass() is on QuerySet
2013-10-08 10:12:37 -07:00
Travis Swicegood
03c8a1929b Add test to verify get_subclass() on QuerySet 2013-10-08 10:38:52 -05:00
Travis Swicegood
9111843752 Refactor to make sure get_subclass() is on QuerySet
There's an edge case where you might want to call get_subclass() on a
QuerySet the same way you can call get() after you have already called
various filter/exclude methods.
2013-10-07 18:15:41 -05:00