money_manager wrapper attempt fails for managers associated on "objects" #2

Closed
wants to merge 31 commits into
from

Projects

None yet

7 participants

@reinbach
Contributor
reinbach commented Nov 8, 2011

after hasattr fails for _default_manager on cls, code was attempting to make use of _default_manager on the cls object.

reinbach and others added some commits Nov 8, 2011
@reinbach reinbach after failed hasattr check on csl object attempted to make use of the…
… attribute
dc2fd9e
@mcordes mcordes Updating money field to handle nulls w/o blowing up. 23be6cc
@reinbach reinbach Merge pull request #1 from mcordes/master
Here you go.
174eaa9
@mcordes mcordes Update setup.py b21b0a9
@reinbach reinbach Merge pull request #2 from mcordes/master
Hey
d0af2f5
@akumria akumria Update the db_prep_ prototypes to work with Django 1.2+
Django 1.2 introduced multiple DB connections. And Django 1.4
removes the compatibility layer. Update our prototypes so we
work with Django 1.2+ or later.
16a4381
@akumria akumria Update version of py-moneyed required.
Actually the current development version is fine.
1f06c92
@akumria akumria So that migration works, specify the default currency in text form.
It is already indicated later on but is easily missible.
3153398
@reinbach reinbach Merge pull request #3 from akumria/master
Update to handle Django 1.4
90cf99a
@akumria akumria Py-moneyed 0.4 has been released, so we can simplify installation eve…
…n more.

And we'll just put in references to where to get the source code for
interested parties.
bbd11f7
@akumria akumria Spellcheck and note South is optional.
With South installed migrations also work.
fb7d843
@akumria akumria Update dependencies so installation is simpler.
The pull request, and a new release of py-moneyed has occurred.
c01d29b
@akumria akumria Increase version and switch location to new upstream. 8cdf631
@akumria akumria Switch to Django 1.2+ method of specifying databases.
At least this way the tests run. Even though they do not pass yet.
1c7487e
@akumria akumria Update to the Django 1.2+ db_prep_save call.
Found by the unittests.
371fc8f
@akumria akumria Correct pip installation command 040cf08
@akumria akumria Fixup py-moneyed version reference. 60a0ae0
@reinbach reinbach Merge pull request #4 from akumria/master
Further updates and make the unittests pass
e0501fc
@reinbach reinbach updated pip install command
added MANIFEST
0043377
@mariocesar @akumria mariocesar PEP8ify 6e34e2b
@reinbach reinbach Merge pull request #7 from akumria/fixup-pep8
PEP8ify
875494a
@pjdelport pjdelport South support: Declare default attribute values.
This cleans up the generated schema migrations, and prevents errors like:
"Cannot successfully create field foo for model bar: name 'XYZ' is not defined."
634002b
@reinbach reinbach Merge pull request #8 from pjdelport/master
South support: Declare default attribute values.
ecc092b
@akumria akumria Allow django-money to be specified as read-only in a model
Monkey patch the Django admin so that we can display django-money fields
read-only. In order to do this, we simply catch the exception that
results from trying to convert a money object (e.g. '10 USD') into a
floating field.

And then we call just ask for the string representation of the field.
770328e
@reinbach reinbach Merge pull request #9 from akumria/allow-readonly
Allow django-money to be specified as read-only in a model
94823e1
Greg Reinbach Some minor enhancements:
    Setting CURRENCIES to set the default Currency list on the admin
    Documentation about how to add a new Currency
c634bd6
@akumria akumria Add descriptions to the custom fields. 54f30b8
@akumria akumria Correctly serialize the field.
When serializing the field, we were outputing the displayed value.

This would not work, because we would (sometime) attempt to unserialize
non-UTF8 data.

Instead, just output the actual amount when serializing, since we also
have the currency to go with the amount everything Just Works (tm).
26458dc
@reinbach reinbach Merge pull request #10 from akumria/serialize_properly
Serialize properly
f59520d
@rach rach Fix AttributeError when Model inherit a manager
AttributeError: 'NoneType' object has no attribute 'get_query_set'
When a Model inherit from an Abstract one which implement a Manager.
In this case '_default_manager' is defined but equal to None
059a97d
@reinbach reinbach Merge pull request #11 from rach/master
Fix AttributeError when Model inherit a manager
09643c4
@jakewins
Contributor
jakewins commented Oct 9, 2012

Hey mate, the amount of work done here is awesome, and I suppose we need to figure out if it's possible to merge this back together, or what to do. It looks like you're maintaining a branch that is significantly more up to date - maybe I can give you commit rights to this repo (or add a link to your fork), and you can take over maintaining it?

Either way, the amount of commits here is way too much for me to merge safely, it will need to be done in some other way, for instance by merging the current state of this repo over to you and then deprecating this repo, if you want to take over maintaining it.

Closing this PR, but let me know what you think about taking over the project :)

@jakewins jakewins closed this Oct 9, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment