arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-28 19:02:16 +00:00
Code Issues Projects Releases Wiki Activity

Restrict versioning to one level of depth for speed

Browse Source 
Also fixed the template for nested changes
This commit is contained in:
FreneticScribbler
2020-09-01 13:41:12 +01:00
parent 6ee9efa39e
commit 1d5429052f
4 changed files with 36 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
RIGS/forms.py
View File

@@ -254,3 +254,4 @@ class EventChecklistForm(forms.ModelForm):
class Meta: class Meta:
model = models.EventChecklist model = models.EventChecklist
fields = '__all__' fields = '__all__'
exclude = ['reviewed_at', 'reviewed_by']

4
RIGS/tests/test_models.py
View File

@@ -382,7 +382,7 @@ class EventAuthorisationTestCase(TestCase):
order=1) order=1)
def test_event_property(self): def test_event_property(self):
auth1 = models.EventAuthorisation.objects.create(event=self.event, email="authroisation@model.test.case", auth1 = models.EventAuthorisation.objects.create(event=self.event, email="authorisation@model.test.case",
name="Test Auth 1", amount=self.event.total - 1, name="Test Auth 1", amount=self.event.total - 1,
sent_by=self.profile) sent_by=self.profile)
self.assertFalse(self.event.authorised) self.assertFalse(self.event.authorised)
@@ -392,7 +392,7 @@ class EventAuthorisationTestCase(TestCase):
def test_last_edited(self): def test_last_edited(self):
with reversion.create_revision(): with reversion.create_revision():
auth = models.EventAuthorisation.objects.create(event=self.event, email="authroisation@model.test.case", auth = models.EventAuthorisation.objects.create(event=self.event, email="authorisation@model.test.case",
name="Test Auth", amount=self.event.total, name="Test Auth", amount=self.event.total,
sent_by=self.profile) sent_by=self.profile)
self.assertIsNotNone(auth.last_edited_at) self.assertIsNotNone(auth.last_edited_at)

2
versioning/templates/partials/version_changes.html
View File

@@ -8,7 +8,7 @@
{% for change in itemchange.field_changes %} {% for change in itemchange.field_changes %}
<li class="list-group-item"> <li class="list-group-item">
<p>{{ change.field.verbose_name|title }}:</p> <p>{{ change.field.verbose_name|title }}:</p>
<div class="dont-break-out">{% include 'partials/version_changes_change.html' with change=itemchange %}</div> <div class="dont-break-out">{% include 'partials/version_changes_change.html' with change=change %}</div>
</li> </li>
{% endfor %} {% endfor %}
</ul> </ul>

63
versioning/versioning.py
View File

@@ -69,7 +69,7 @@ class FieldComparison(object):
class ModelComparison(object): class ModelComparison(object):
def __init__(self, old=None, new=None, version=None, excluded_keys=[]): def __init__(self, old=None, new=None, version=None, follow=False, excluded_keys=[]):
# recieves two objects of the same model, and compares them. Returns an array of FieldCompare objects # recieves two objects of the same model, and compares them. Returns an array of FieldCompare objects
try: try:
self.fields = old._meta.get_fields() self.fields = old._meta.get_fields()
@@ -80,6 +80,7 @@ class ModelComparison(object):
self.new = new self.new = new
self.excluded_keys = excluded_keys self.excluded_keys = excluded_keys
self.version = version self.version = version
self.follow = follow
@cached_property @cached_property
def revision(self): def revision(self):
@@ -117,42 +118,41 @@ class ModelComparison(object):
@cached_property @cached_property
def item_changes(self): def item_changes(self):
item_type = ContentType.objects.get_for_model(self.version.object) if self.follow:
old_item_versions = self.version.parent.revision.version_set.exclude(content_type=item_type) item_type = ContentType.objects.get_for_model(self.version.object)
new_item_versions = self.version.revision.version_set.exclude(content_type=item_type) old_item_versions = self.version.parent.revision.version_set.exclude(content_type=item_type)
new_item_versions = self.version.revision.version_set.exclude(content_type=item_type)
comparisonParams = {'excluded_keys': ['id', 'event', 'order', 'checklist']} comparisonParams = {'excluded_keys': ['id', 'event', 'order', 'checklist']}
# Build some dicts of what we have # Build some dicts of what we have
item_dict = {} # build a list of items, key is the item_pk item_dict = {} # build a list of items, key is the item_pk
# FIXME Removing the if checks makes things REALLY slow... for version in old_item_versions: # put all the old versions in a list
for version in old_item_versions: # put all the old versions in a list # if version.field_dict["event_id"] == int(self.new.pk):
print(version) compare = ModelComparison(old=version._object_version.object, **comparisonParams)
# if version.field_dict["event_id"] == int(self.new.pk): item_dict[version.object_id] = compare
compare = ModelComparison(old=version._object_version.object, **comparisonParams)
item_dict[version.object_id] = compare
for version in new_item_versions: # go through the new versions for version in new_item_versions: # go through the new versions
# if version.field_dict["event_id"] == int(self.new.pk): # if version.field_dict["event_id"] == int(self.new.pk):
try: try:
compare = item_dict[version.object_id] # see if there's a matching old version compare = item_dict[version.object_id] # see if there's a matching old version
compare.new = version._object_version.object # then add the new version to the dictionary compare.new = version._object_version.object # then add the new version to the dictionary
except KeyError: # there's no matching old version, so add this item to the dictionary by itself except KeyError: # there's no matching old version, so add this item to the dictionary by itself
compare = ModelComparison(new=version._object_version.object, **comparisonParams) compare = ModelComparison(new=version._object_version.object, **comparisonParams)
if compare.new: if compare.new:
compare.name = str(compare.new) compare.name = str(compare.new)
else: else:
compare.name = str(compare.old) compare.name = str(compare.old)
item_dict[version.object_id] = compare # update the dictionary with the changes item_dict[version.object_id] = compare # update the dictionary with the changes
changes = [] changes = []
for (_, compare) in list(item_dict.items()): for (_, compare) in list(item_dict.items()):
if compare.fields_changed: if compare.fields_changed:
changes.append(compare) changes.append(compare)
return changes return changes
@cached_property @cached_property
def items_changed(self): def items_changed(self):
@@ -199,5 +199,6 @@ class RIGSVersion(Version):
return ModelComparison( return ModelComparison(
version=self, version=self,
new=self._object_version.object, new=self._object_version.object,
old=self.parent._object_version.object if self.parent else None old=self.parent._object_version.object if self.parent else None,
follow=True
) )