diff options
| -rw-r--r-- | archaeological_operations/models.py | 1 | ||||
| -rw-r--r-- | ishtar_common/models_common.py | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index 293b1e933..caaff33d9 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -1262,6 +1262,7 @@ class Operation( "closing": "serialize_closing", "archaeological_sites_list": "archaeological_sites_list", "documents_list": "documents_list", + "is_active": "is_active", } SERIALIZE_EXCLUDE = [ "search_vector", diff --git a/ishtar_common/models_common.py b/ishtar_common/models_common.py index 1db38fbb5..feef29414 100644 --- a/ishtar_common/models_common.py +++ b/ishtar_common/models_common.py @@ -4149,6 +4149,8 @@ class SerializeItem: result = json.loads(serialize("json", [self], fields=serialize_fields)) full_result.update(result[0]["fields"]) for prop in self.SERIALIZE_PROPERTIES: + if prop in self.SERIALIZE_EXCLUDE or prop in exclude: + continue if hasattr(self, prop) and prop not in full_result: full_result[prop] = getattr(self, prop) if "point_2d_geojson" in full_result: @@ -4156,11 +4158,15 @@ class SerializeItem: if "multi_polygon_geojson" in full_result: full_result["multi_polygon"] = True for prop in self.SERIALIZE_DATES: + if prop in self.SERIALIZE_EXCLUDE or prop in exclude: + continue dt = getattr(self, prop) or "" if dt: dt = human_date(dt) full_result[prop] = dt for k in self.SERIALIZE_CALL: + if k in self.SERIALIZE_EXCLUDE or k in exclude: + continue full_result[k] = getattr(self, self.SERIALIZE_CALL[k])() full_result["SLUG"] = self.SLUG full_result["pk"] = f"external_{self.pk}" |