mirror of
https://github.com/pacnpal/thrillwiki_django_no_react.git
synced 2026-02-05 14:35:17 -05:00
Based on the git diff provided, here's a concise and descriptive commit message:
feat: add security event taxonomy and optimize park queryset - Add comprehensive security_event_types ChoiceGroup with categories for authentication, MFA, password, account, session, and API key events - Include severity levels, icons, and CSS classes for each event type - Fix park queryset optimization by using select_related for OneToOne location relationship - Remove location property fields (latitude/longitude) from values() call as they are not actual DB columns - Add proper location fields (city, state, country) to values() for map display This change enhances security event tracking capabilities and resolves a queryset optimization issue where property decorators were incorrectly used in values() queries.
This commit is contained in:
@@ -107,10 +107,15 @@ class CompanyCreateInputSerializer(serializers.Serializer):
|
||||
allow_blank=True,
|
||||
)
|
||||
|
||||
# Image URLs
|
||||
# Image URLs (legacy - prefer using image IDs)
|
||||
logo_url = serializers.URLField(required=False, allow_blank=True)
|
||||
banner_image_url = serializers.URLField(required=False, allow_blank=True)
|
||||
card_image_url = serializers.URLField(required=False, allow_blank=True)
|
||||
|
||||
# Cloudflare image IDs (preferred for new submissions)
|
||||
logo_image_id = serializers.CharField(max_length=255, required=False, allow_blank=True)
|
||||
banner_image_id = serializers.CharField(max_length=255, required=False, allow_blank=True)
|
||||
card_image_id = serializers.CharField(max_length=255, required=False, allow_blank=True)
|
||||
|
||||
|
||||
class CompanyUpdateInputSerializer(serializers.Serializer):
|
||||
@@ -144,10 +149,15 @@ class CompanyUpdateInputSerializer(serializers.Serializer):
|
||||
allow_blank=True,
|
||||
)
|
||||
|
||||
# Image URLs
|
||||
# Image URLs (legacy - prefer using image IDs)
|
||||
logo_url = serializers.URLField(required=False, allow_blank=True)
|
||||
banner_image_url = serializers.URLField(required=False, allow_blank=True)
|
||||
card_image_url = serializers.URLField(required=False, allow_blank=True)
|
||||
|
||||
# Cloudflare image IDs (preferred for new submissions)
|
||||
logo_image_id = serializers.CharField(max_length=255, required=False, allow_blank=True)
|
||||
banner_image_id = serializers.CharField(max_length=255, required=False, allow_blank=True)
|
||||
card_image_id = serializers.CharField(max_length=255, required=False, allow_blank=True)
|
||||
|
||||
|
||||
# === RIDE MODEL SERIALIZERS ===
|
||||
|
||||
@@ -493,6 +493,18 @@ def ensure_filter_option_format(options: list[Any]) -> list[dict[str, Any]]:
|
||||
"count": option.get("count"),
|
||||
"selected": option.get("selected", False),
|
||||
}
|
||||
elif isinstance(option, tuple):
|
||||
# Tuple format: (value, label) or (value, label, count)
|
||||
if len(option) >= 2:
|
||||
standardized_option = {
|
||||
"value": str(option[0]),
|
||||
"label": str(option[1]),
|
||||
"count": option[2] if len(option) > 2 else None,
|
||||
"selected": False,
|
||||
}
|
||||
else:
|
||||
# Single-element tuple, treat as simple value
|
||||
standardized_option = {"value": str(option[0]), "label": str(option[0]), "count": None, "selected": False}
|
||||
elif hasattr(option, "value") and hasattr(option, "label"):
|
||||
# RichChoice object format
|
||||
standardized_option = {
|
||||
|
||||
Reference in New Issue
Block a user