Hopiu/django-model-utils
1
0
Fork 0
mirror of https://github.com/Hopiu/django-model-utils.git synced 2026-03-17 04:10:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
361 commits 5 branches 0 tags 1.4 MiB
Commit graph

361 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Carl Meyer
5a33ff760a Fixed indexing into Choices so its useful. 2013-09-24 15:13:27 -06:00
Carl Meyer
4b6a800050 Fix bug with child/grandchild select_subclasses in Django 1.6+; thanks Keryn Knight. 2013-09-20 10:04:10 -06:00
Carl Meyer
8bead336a7 Merge pull request #77 from Tavistock/patch-1 
Documentation: fixed code block
 2013-09-08 18:56:25 -07:00
Tavistock
ff64b06c9d fixed code block 
the code block was displaying incorrectly
 2013-09-08 13:59:54 -04:00
Carl Meyer
4e7ddfc221 Bump version for dev. 2013-08-29 22:35:32 -06:00
Carl Meyer
edbef99ce2 Bump version for 1.5.0 release. 2013-08-29 22:06:44 -06:00
Carl Meyer
2e44f1c2c0 Add option-groups capability to Choices. 2013-08-29 22:00:53 -06:00
Carl Meyer
32f839b577 Add Changelog note about Choices equality/addition. 2013-08-25 09:04:27 -06:00
Tony Aldridge
b706aee4a9 Added tests to improve coverage 2013-08-25 08:29:10 +01:00
Tony Aldridge
2d6b8b4603 Alphabetised authors 2013-08-25 08:22:20 +01:00
Tony Aldridge
1a6d9a193e Removed redundant inequality method on Choices 2013-08-24 10:51:25 +01:00
Tony Aldridge
cac7416cda Moved documentation for Choices field to the right place 2013-08-24 10:40:53 +01:00
Tony Aldridge
3485df15f2 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	README.rst
 2013-08-24 10:36:21 +01:00
Tony Aldridge
814df377bd Corrected typo 2013-08-23 17:04:18 +01:00
Tony Aldridge
19560d9026 Added self to Authors file 2013-08-23 17:02:31 +01:00
Tony Aldridge
003ad70805 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
 2013-08-23 16:58:10 +01:00
Den Lesnov
18999c43dd Added deepcopy test 2013-08-21 17:15:19 +04:00
Trey Hunner
09278083e8 Fix typo noted by @silonov 2013-08-17 11:35:03 -07:00
Trey Hunner
e1faec7577 Merge pull request #73 from silonov/json_fields_support 
Json fields support
 2013-08-17 01:46:31 -07:00
Trey Hunner
2679f6114b Merge branch 'silonov-json_fields_support' 
Conflicts:
	CHANGES.rst
	model_utils/tests/tests.py
 2013-08-17 01:40:09 -07:00
Den Lesnov
5f291a6a4a Implemented __deepcopy__ to avoid infinite recursion in __getattr__ while deepcopying a Choices instance 2013-08-15 15:01:09 +04:00
Mikhail Silonov
ef510d53dd Removed reinvented wheel 2013-08-12 13:22:34 +04:00