arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-18 22:12:14 +00:00
Code Issues Projects Releases Wiki Activity

Big pile of minor code cleanups

Browse Source
This commit is contained in:
FreneticScribbler
2022-01-12 20:54:32 +00:00
parent 3abb73872b
commit e002ab7bed
13 changed files with 78 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
versioning/tests/test_models.py
View File

@@ -146,7 +146,7 @@ class RIGSVersionTestCase(TestCase):
self.assertFalse(current_version.changes.fields_changed)
self.assertTrue(current_version.changes.anything_changed)
self.assertTrue(diffs[0].old is None)
self.assertIsNone(diffs[0].old)
self.assertEqual(diffs[0].new.name, "TI I1")
# Edit the item
@@ -188,4 +188,4 @@ class RIGSVersionTestCase(TestCase):
self.assertTrue(current_version.changes.anything_changed)
self.assertEqual(diffs[0].old.name, "New Name")
self.assertTrue(diffs[0].new is None)
self.assertIsNone(diffs[0].new)

6
versioning/versioning.py
View File

@@ -13,14 +13,14 @@ from training.models import Trainee
logger = logging.getLogger('tec.pyrigs')
class FieldComparison(object):
class FieldComparison:
def __init__(self, field=None, old=None, new=None):
self.field = field
self._old = old
self._new = new
def display_value(self, value):
if (isinstance(self.field, IntegerField) or isinstance(self.field, CharField)) and self.field.choices is not None and len(self.field.choices) > 0:
if (isinstance(self.field, (IntegerField, CharField)) and self.field.choices is not None and len(self.field.choices) > 0:
choice = [x[1] for x in self.field.choices if x[0] == value]
if len(choice) > 0:
return choice[0]
@@ -71,7 +71,7 @@ class FieldComparison(object):
return outputDiffs
class ModelComparison(object):
class ModelComparison:
def __init__(self, old=None, new=None, version=None, follow=False, excluded_keys=['date_joined']):
# recieves two objects of the same model, and compares them. Returns an array of FieldCompare objects
try: