Disable bulk_update (generate infinite loop and crash) - Do not post treat on qrcode gen

2 files changed, 6 insertions, 3 deletions

diff --git a/ishtar_common/models_common.py b/ishtar_common/models_common.py
index 109174439..40b188158 100644
--- a/ishtar_common/models_common.py
+++ b/ishtar_common/models_common.py
@@ -2986,10 +2986,11 @@ class CompleteIdentifierItem(models.Model, ImageContainerModel):
             tmpdir_created = True
         filename = tmpdir + os.sep + "qrcode.png"
         qr.png(filename, scale=settings.ISHTAR_QRCODE_SCALE)
-        with open(filename, "rb") as qrfile:
-            self.qrcode.save("qrcode.png", File(qrfile))
         self.skip_history_when_saving = True
         self._no_move = True
+        self._no_geo_check = True
+        with open(filename, "rb") as qrfile:
+            self.qrcode.save("qrcode.png", File(qrfile))
         self.save()
         if tmpdir_created:
             shutil.rmtree(tmpdir)
diff --git a/ishtar_common/utils.py b/ishtar_common/utils.py
index 9b2f38819..bad6399df 100644
--- a/ishtar_common/utils.py
+++ b/ishtar_common/utils.py
@@ -552,7 +552,9 @@ def _cached_label_changed(sender, **kwargs):
     if force_update or hasattr(instance, "update_search_vector"):
         updated = instance.update_search_vector()
     if hasattr(instance, "_cached_labels_bulk_update"):
-        updated = instance._cached_labels_bulk_update() or updated
+        # updated = instance._cached_labels_bulk_update() or updated
+        # disable now
+        pass
     if not updated and hasattr(instance, "_get_associated_cached_labels"):
         for item in instance._get_associated_cached_labels():
             item._cascade_change = True