diff --git a/project/api/event/schemas.py b/project/api/event/schemas.py
index aba641b..c2f435b 100644
--- a/project/api/event/schemas.py
+++ b/project/api/event/schemas.py
@@ -88,6 +88,7 @@ class EventSearchItemSchema(EventRefSchema):
photo = fields.Nested(ImageRefSchema)
place = fields.Nested(PlaceSearchItemSchema, attribute="event_place")
status = EnumField(EventStatus)
+ booked_up = marshmallow.auto_field()
organizer = fields.Nested(OrganizerRefSchema)
organization = fields.Nested(OrganizationRefSchema, attribute="admin_unit")
categories = fields.List(fields.Nested(EventCategoryRefSchema))
diff --git a/project/templates/_macros.html b/project/templates/_macros.html
index 551442c..900eaf1 100644
--- a/project/templates/_macros.html
+++ b/project/templates/_macros.html
@@ -125,7 +125,7 @@
-
{{ event.name }}{{ render_event_status_pill(event) }}
+
{{ event.name }}{{ render_event_warning_pills(event) }}
{% if dates and dates|length > 1 %}
diff --git a/project/templates/event_date/list.html b/project/templates/event_date/list.html
index 43f5774..c501db4 100644
--- a/project/templates/event_date/list.html
+++ b/project/templates/event_date/list.html
@@ -1,5 +1,5 @@
{% extends "layout.html" %}
-{% from "_macros.html" import render_google_filter_autocomplete_header, render_event_dates_filter_form, render_pagination, render_event_status_pill, render_place, render_events_sub_menu %}
+{% from "_macros.html" import render_google_filter_autocomplete_header, render_event_dates_filter_form, render_pagination, render_place, render_events_sub_menu %}
{% block title %}
{{ _('Event Dates') }}
{% endblock %}
@@ -175,7 +175,7 @@
'' +
img_tag +
'
' +
- '
' + event.name + ' ' + render_event_status_pill(event) + '
' +
+ '
' + event.name + ' ' + render_event_warning_pills(event) + '
' +
'
' + event.description.truncate(100) + '
' +
'
' +
'
- {{ render_event_status_pill(event) }}
+ {{ render_event_warning_pills(event) }}
{{ event.organizer.name }}
{% endfor %}
diff --git a/project/templates/manage/reference_requests_incoming.html b/project/templates/manage/reference_requests_incoming.html
index ae0488f..fd5890c 100644
--- a/project/templates/manage/reference_requests_incoming.html
+++ b/project/templates/manage/reference_requests_incoming.html
@@ -1,6 +1,6 @@
{% extends "layout_manage.html" %}
{% set active_id = "reference_requests_incoming" %}
-{% from "_macros.html" import render_reference_request_review_status_pill, render_event_status_pill, render_event_date, render_pagination, render_event_organizer %}
+{% from "_macros.html" import render_reference_request_review_status_pill, render_event_date, render_pagination, render_event_organizer %}
{% block title %}
{{ _('Reference requests') }}
{% endblock %}
diff --git a/project/templates/manage/reference_requests_outgoing.html b/project/templates/manage/reference_requests_outgoing.html
index e5fa9ba..6e8cea7 100644
--- a/project/templates/manage/reference_requests_outgoing.html
+++ b/project/templates/manage/reference_requests_outgoing.html
@@ -1,6 +1,6 @@
{% extends "layout_manage.html" %}
{% set active_id = "reference_requests_outgoing" %}
-{% from "_macros.html" import render_reference_request_review_status_pill, render_event_status_pill, render_event_date, render_pagination, render_event_organizer %}
+{% from "_macros.html" import render_reference_request_review_status_pill, render_event_date, render_pagination, render_event_organizer %}
{% block title %}
{{ _('Reference requests') }}
{% endblock %}
diff --git a/project/templates/manage/references_incoming.html b/project/templates/manage/references_incoming.html
index 34778d1..ddbe7c5 100644
--- a/project/templates/manage/references_incoming.html
+++ b/project/templates/manage/references_incoming.html
@@ -1,6 +1,6 @@
{% extends "layout_manage.html" %}
{% set active_id = "references_incoming" %}
-{% from "_macros.html" import render_event_status_pill, render_event_date, render_pagination, render_event_organizer %}
+{% from "_macros.html" import render_event_warning_pills, render_event_date, render_pagination, render_event_organizer %}
{% block title %}
{{ _('References') }}
{% endblock %}
@@ -21,7 +21,7 @@
{{ _('Delete') }}…
- {{ render_event_status_pill(reference.event) }}
+ {{ render_event_warning_pills(reference.event) }}