feat: allow duplicate resource names, show the room next to the name
This commit is contained in:
1 parent
84724879c7
commit
d37d8bc786
8 files changed
+39
-21
No files matched your search
@@ -4,7 +4,8 @@
|
||||
|
||||
{% block content %}
|
||||
<p>
|
||||
{{ resource.type.label }} <em>{{ resource.label }}</em> wird endgültig gelöscht.
|
||||
{{ resource.type.label }} <em>{{ resource.label }}</em>
|
||||
{%- if resource.group %} ({{ resource.group.label }}){% endif %} wird endgültig gelöscht.
|
||||
</p>
|
||||
{% if upcoming > 0 or past > 0 %}
|
||||
<p class="pt-2" data-booking-count>
|
||||
|
||||
@@ -24,6 +24,7 @@
|
||||
|
||||
<p class="pb-4 text-sm text-gray-500">
|
||||
{{ resource.type.label }} · {{ resource.label }}
|
||||
{%- if resource.group %} · {{ resource.group.label }}{% endif %}
|
||||
</p>
|
||||
|
||||
{% include 'booking/_fields.html.twig' %}
|
||||
|
||||
@@ -21,6 +21,7 @@
|
||||
|
||||
<p class="pb-4 text-sm text-gray-500">
|
||||
{{ resource.type.label }} · {{ booking.date|format_datetime(pattern: 'EEEE, d. MMMM y') }}
|
||||
{%- if resource.group %} · {{ resource.group.label }}{% endif %}
|
||||
</p>
|
||||
|
||||
{% if booking.partOfSeries %}
|
||||
|
||||
@@ -4,7 +4,8 @@
|
||||
|
||||
{% block content %}
|
||||
<p>
|
||||
{{ series.resource.label }} · {{ series.describe }}
|
||||
{{ series.resource.label }}
|
||||
{%- if series.resource.group %} ({{ series.resource.group.label }}){% endif %} · {{ series.describe }}
|
||||
{% if series.user.id != app.user.id %}
|
||||
— Wiederkehrende Buchung von <em>{{ series.user.name }}</em>
|
||||
{% endif %}
|
||||
|
||||
@@ -33,7 +33,8 @@
|
||||
{% endif %}
|
||||
</span>
|
||||
{% if tile.mine %}
|
||||
<span class="badge bg-primary text-white">{{ tile.mine.resource.label }}</span>
|
||||
<span class="badge bg-primary text-white">{{ tile.mine.resource.label }}
|
||||
{%- if tile.mine.resource.group %} · {{ tile.mine.resource.group.label }}{% endif %}</span>
|
||||
{% endif %}
|
||||
</div>
|
||||
</a>
|
||||
|
||||
Reference in new issue
Block a user