mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-01-20 15:02:31 +00:00
Add translating choice fields to correct values.
This commit is contained in:
@@ -16,6 +16,7 @@ import simplejson
|
|||||||
from reversion.models import Version
|
from reversion.models import Version
|
||||||
from django.contrib.contenttypes.models import ContentType # Used to lookup the content_type
|
from django.contrib.contenttypes.models import ContentType # Used to lookup the content_type
|
||||||
from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
|
from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
|
||||||
|
from django.db.models import ForeignKey, IntegerField
|
||||||
|
|
||||||
from RIGS import models, forms
|
from RIGS import models, forms
|
||||||
import datetime
|
import datetime
|
||||||
@@ -35,8 +36,21 @@ def model_compare(oldObj, newObj, excluded_keys=[]):
|
|||||||
class FieldCompare(object):
|
class FieldCompare(object):
|
||||||
def __init__(self, field=None, old=None, new=None):
|
def __init__(self, field=None, old=None, new=None):
|
||||||
self.field = field
|
self.field = field
|
||||||
self.old = old
|
self._old = old
|
||||||
self.new = new
|
self._new = new
|
||||||
|
|
||||||
|
def display_value(self, value):
|
||||||
|
if isinstance(self.field, IntegerField) and len(self.field.choices) > 0:
|
||||||
|
return [x[1] for x in self.field.choices if x[0] == value][0]
|
||||||
|
return value
|
||||||
|
|
||||||
|
@property
|
||||||
|
def old(self):
|
||||||
|
return self.display_value(self._old)
|
||||||
|
|
||||||
|
@property
|
||||||
|
def new(self):
|
||||||
|
return self.display_value(self._new)
|
||||||
|
|
||||||
changes = []
|
changes = []
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user