From 7276e506ee8ef144fc61f03e9acda311e36e4cad Mon Sep 17 00:00:00 2001 From: Chris Smit Date: Fri, 4 Oct 2024 13:24:56 +0200 Subject: [PATCH] Make safety layer tags red --- apps/annotations/models.py | 15 ++++++++++++--- templates/annotations/tag_ui.html | 12 ++++++++---- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/apps/annotations/models.py b/apps/annotations/models.py index f688fc034..d01d37598 100644 --- a/apps/annotations/models.py +++ b/apps/annotations/models.py @@ -98,20 +98,29 @@ def add_tag(self, tag: Tag, team: Team, added_by: CustomUser): self.tags.add(tag, through_defaults={"team": team, "user": added_by}) def get_linked_tags(self): - return self.tags.all() + tags = [] + for tag in self.tags.all(): + bage_color = "badge-neutral" + if tag.is_system_tag: + bage_color = "badge-error" if tag.category == TagCategories.SAFETY_LAYER_RESPONSE else "badge-warning" + tags.append((tag, bage_color)) + return tags def user_tag_names(self): return {tag["name"] for tag in self.tags_json if not tag["is_system_tag"]} def system_tags_names(self): - return {tag["name"] for tag in self.tags_json if tag["is_system_tag"]} + return {(tag["name"], tag["category"]) for tag in self.tags_json if tag["is_system_tag"]} def all_tag_names(self): return [tag["name"] for tag in self.tags_json] @cached_property def tags_json(self): - return [{"name": tag.name, "id": tag.id, "is_system_tag": tag.is_system_tag} for tag in self.tags.all()] + return [ + {"name": tag.name, "id": tag.id, "is_system_tag": tag.is_system_tag, "category": tag.category} + for tag in self.tags.all() + ] class UserComment(BaseTeamModel): diff --git a/templates/annotations/tag_ui.html b/templates/annotations/tag_ui.html index 69e55bf63..ea8a14ecc 100644 --- a/templates/annotations/tag_ui.html +++ b/templates/annotations/tag_ui.html @@ -1,8 +1,8 @@
{% if not edit_mode %} - {% for tag in object.get_linked_tags %} -
{{ tag.name }}
{% endfor %} @@ -35,8 +35,12 @@
{% if object.system_tags_names %} System tags: - {% for tag in object.system_tags_names %} -
{{ tag }}
+ {% for tag, category in object.system_tags_names %} + {% if category == 'safety_layer_response' %} +
{{ tag }}
+ {% else %} +
{{ tag }}
+ {% endif %} {% endfor %} {% endif %}