fix(access): dont use organization property within organization model

ref: #605 #607
nofusscomputing · Feb 19, 2025 · 1663e98 · 1663e98
1 parent f765fe1
commit 1663e98
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/app/access/models/organization.py b/app/access/models/organization.py
@@ -67,12 +67,6 @@ def save(self, *args, **kwargs):
     modified = AutoLastModifiedField()
 
 
-    @property
-    def organization(self):
-
-        return self
-
-
     def get_organization(self):
         return self
 

diff --git a/app/core/mixin/history_save.py b/app/core/mixin/history_save.py
@@ -157,12 +157,19 @@ def save_history(self, before: dict, after: dict, history_model = None) -> bool:
                 current_user = None
 
 
+        organization = getattr(self, 'organization', None)
+
+        if self._meta.model_name == 'organization':
+
+            organization = self
+
+
         if before_json != after_json:
 
             if parent_model is not None:
 
                 entry = history_model.objects.create(
-                    organization = self.organization,
+                    organization = organization,
                     before = before_json,
                     after = after_json,
                     action = action,
@@ -180,7 +187,7 @@ def save_history(self, before: dict, after: dict, history_model = None) -> bool:
             else:
 
                 entry = history_model.objects.create(
-                    organization = self.organization,
+                    organization = organization,
                     before = before_json,
                     after = after_json,
                     action = action,