Skip to content

+added compatibility for django 1.5 - 1.7.x for models/managers.py #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
charlietjhin wants to merge 4 commits into
base: master
Choose a base branch
from
Open

+added compatibility for django 1.5 - 1.7.x for models/managers.py #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aa53249
+added compatibility for django 1.5 - 1.7.x for models/managers.py
charlietjhin Feb 13, 2015
ee7a0e4
Change LOOKUP_SEP location in managers.py and fix migration in fields…
yohanesa Feb 20, 2015
265089e
fix managers.py on import LOOKUP_SEP
yohanesa Feb 20, 2015
629ba38
Merge pull request #1 from yohanesa/master
charlietjhin Feb 20, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion money/contrib/django/models/fields.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class MoneyField(models.DecimalField):

def __init__(self, verbose_name=None, name=None,
max_digits=None, decimal_places=None,
default=None, default_currency=None, blank=True, **kwargs):
default=None, default_currency=None, blank=True, null=True, **kwargs):
# We add the currency field except when using frozen south orm. See introspection rules below.
self.add_currency_field = not kwargs.pop('no_currency_field', False)
if isinstance(default, Money):
Expand Down
6 changes: 5 additions & 1 deletion money/contrib/django/models/managers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@
class QuerysetWithMoney(QuerySet):

def _update_params(self, kwargs):
from django.db.models.sql.constants import LOOKUP_SEP
#add support for django 1.5 - 1.7.x
try:
from django.db.models.constants import LOOKUP_SEP
except ImportError:
from django.db.models.sql.constants import LOOKUP_SEP
from money import Money
to_append = {}
for name, value in kwargs.items():
Expand Down