Skip to content
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.

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

Fix trailing zeros in decimal #261

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
9 changes: 8 additions & 1 deletion src/auditlog/diff.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from django.conf import settings
from django.core.exceptions import ObjectDoesNotExist
from django.db.models import Model, NOT_PROVIDED, DateTimeField
from django.db.models import Model, NOT_PROVIDED, DateTimeField, DecimalField
from django.utils import timezone
from django.utils.encoding import smart_text

Expand Down Expand Up @@ -73,6 +73,13 @@ def get_field_value(obj, field):
value = timezone.make_naive(value, timezone=timezone.utc)
except ObjectDoesNotExist:
value = field.default if field.default is not NOT_PROVIDED else None
elif isinstance(field, DecimalField):
# Fix for Issue #260
# DecimalFields can be stored with multiple zeroes after decimal but
# might only have one zero after save() method, so we need to remove
# all extra zeroes for an accurate comparison.
value_before_clean = smart_text(getattr(obj, field.name, None))
value = value_before_clean.rstrip('0').rstrip('.') if '.' in value_before_clean else value_before_clean
else:
try:
value = smart_text(getattr(obj, field.name, None))
Expand Down