summaryrefslogtreecommitdiff
path: root/ishtar_common
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2019-01-14 19:26:25 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2019-01-14 19:26:25 +0100
commit8f45297edd7dfdd677b9a708b560532073b2c62f (patch)
treeb0e482fb4f05fc2acf31e4eea31f94aa5d6f1f9a /ishtar_common
parent6275ac4d3388f912a831c3f6178c3832ce9297b5 (diff)
downloadIshtar-8f45297edd7dfdd677b9a708b560532073b2c62f.tar.bz2
Ishtar-8f45297edd7dfdd677b9a708b560532073b2c62f.zip
Fix M2M rollback: prevent bad rewriting of history_m2m
Diffstat (limited to 'ishtar_common')
-rw-r--r--ishtar_common/models.py46
-rw-r--r--ishtar_common/utils.py20
2 files changed, 39 insertions, 27 deletions
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index ef7dc8a4e..528ba6512 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -23,9 +23,11 @@ Models description
import copy
import datetime
import inspect
+from importlib import import_module
from jinja2 import TemplateSyntaxError
import logging
import os
+import pytz
import re
import shutil
import tempfile
@@ -33,6 +35,7 @@ import time
from cStringIO import StringIO
from subprocess import Popen, PIPE
+
from PIL import Image
from django.conf import settings
from django.contrib.auth.models import User, Group
@@ -53,6 +56,7 @@ from django.db.utils import DatabaseError
from django.template.defaultfilters import slugify
from django.utils.functional import lazy
from django.utils.safestring import SafeUnicode, mark_safe
+#from django.utils.timezone import now, timedelta
from django.utils.translation import ugettext_lazy as _, ugettext, \
pgettext_lazy, activate, deactivate
from secretary import Renderer as SecretaryRenderer
@@ -152,11 +156,15 @@ class HistoryModel(models.Model):
class Meta:
abstract = True
- def m2m_listing(self, key):
+ def m2m_listing(self, key, create=False):
if not self.history_m2m or key not in self.history_m2m:
return
- related_model = getattr(self, key).model
- return related_model.history_decompress(self.history_m2m[key])
+ models = import_module(self.__class__.__module__ + ".models")
+ model = getattr(
+ models, self.__class__.__name__[len('Historical'):])
+ related_model = getattr(model, key).rel.model
+ return related_model.history_decompress(self.history_m2m[key],
+ create=create)
class HistoricalRecords(BaseHistoricalRecords):
@@ -167,6 +175,7 @@ class HistoricalRecords(BaseHistoricalRecords):
except (User.DoesNotExist, AssertionError):
# on batch removing of users, user could have disappeared
return
+ force = getattr(instance, "_force_history", False)
manager = getattr(instance, self.manager_name)
attrs = {}
for field in instance._meta.fields:
@@ -174,7 +183,10 @@ class HistoricalRecords(BaseHistoricalRecords):
q_history = instance.history \
.filter(history_modifier_id=history_modifier.pk) \
.order_by('-history_date', '-history_id')
+ # instance.skip_history_when_saving = True
if not q_history.count():
+ if force:
+ delattr(instance, '_force_history')
manager.create(history_type=type,
history_date=datetime.datetime.now(), **attrs)
return
@@ -186,7 +198,6 @@ class HistoricalRecords(BaseHistoricalRecords):
q = q_history.filter(history_date__isnull=False,
history_date__gt=min_history_date) \
.order_by('-history_date', '-history_id')
- force = getattr(instance, "_force_history", False)
if not force and q.count():
return
@@ -1590,29 +1601,26 @@ class BaseHistorizedItem(DocumentItem, FullSearch, Imported, JsonData,
k = k + "_id"
setattr(self, k, getattr(new_item, k))
- # M2M history
- if k.startwith('historical_') \
- and k[len('historical_'):] in field_keys:
- value = getattr(new_item, k)
- if not value:
- continue
- base_k = k[len('historical_'):]
- base_field = self._meta.get_field(base_k)
- base_field.clear()
- new_values = base_field.related_model.history_decompress(
- value, create=True
- )
- for val in new_values:
- base_field.add(val)
try:
self.history_modifier = User.objects.get(
pk=new_item.history_modifier_id)
except User.ObjectDoesNotExist:
pass
+ self.save()
+ saved_m2m = new_item.history_m2m.copy()
+ for hist_key in self.HISTORICAL_M2M:
+ # after each association m2m is rewrite - force the original
+ # to be reset
+ new_item.history_m2m = saved_m2m
+ values = new_item.m2m_listing(hist_key, create=True) or []
+ hist_field = getattr(self, hist_key)
+ hist_field.clear()
+ for val in values:
+ hist_field.add(val)
# force label regeneration
self._cached_label_checked = False
self.save()
- except:
+ except ObjectDoesNotExist:
raise HistoryError(u"The rollback has failed.")
# clean the obsolete history
for historized_item in to_del:
diff --git a/ishtar_common/utils.py b/ishtar_common/utils.py
index e293562ff..ba77a07e4 100644
--- a/ishtar_common/utils.py
+++ b/ishtar_common/utils.py
@@ -943,13 +943,17 @@ def m2m_historization_changed(sender, **kwargs):
continue
values.append(value.history_compress())
hist_values[attr] = values
- # force resave of last history record
- if hasattr(obj, 'skip_history_when_saving'):
- delattr(obj, 'skip_history_when_saving')
obj.history_m2m = hist_values
- obj._force_history = True
- q = obj.history.order_by("-history_date")
- if q.count():
- last = q.all()[0]
- last.delete()
+ if getattr(obj, 'skip_history_when_saving', False):
+ # assume the last modifier is good...
+ q = obj.history.filter(
+ history_modifier_id=obj.history_modifier_id,
+ ).order_by('-history_date', '-history_id')
+ hist = q.all()[0]
+ hist.history_m2m = hist_values
+ hist.history_date = hist.last_modified = datetime.datetime.now()
+ hist.save()
+ obj.skip_history_when_saving = True
+ elif not obj.history_modifier:
+ obj.skip_history_when_saving = True
obj.save()