arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-19 14:32:16 +00:00
Code Issues Projects Releases Wiki Activity

Fix associated events being discarded on subhire edit

Browse Source
This commit is contained in:
FreneticScribbler
2022-12-16 14:14:43 +00:00
parent e100f5a1d4
commit 311c02d554
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
RIGS/templates/event_detail.html
View File

@@ -48,7 +48,7 @@
<h4>Event Items</h4> <h4>Event Items</h4>
</div> </div>
{% include 'partials/item_table.html' %} {% include 'partials/item_table.html' %}
{% if event.subhire_set %} {% if event.subhire_set.count > 0 %}
<div class="card-body"><h4>Associated Subhires</h4></div> <div class="card-body"><h4>Associated Subhires</h4></div>
{% with event.subhire_set.all as events %} {% with event.subhire_set.all as events %}
{% include 'partials/event_table.html' %} {% include 'partials/event_table.html' %}

2
RIGS/templates/partials/event_table.html
View File

@@ -42,7 +42,7 @@
<!---Details--> <!---Details-->
<td id="event_details" class="w-100"> <td id="event_details" class="w-100">
<h4> <h4>
<a href="{% url 'event_detail' event.pk %}"> <a href="{{event.get_absolute_url}}">
{{ event.name }} {{ event.name }}
</a> </a>
{% if event.venue %} {% if event.venue %}

8
RIGS/templates/subhire_form.html
View File

@@ -98,7 +98,13 @@
<div class="card-header">Associated Event(s)</div> <div class="card-header">Associated Event(s)</div>
<div class="card-body"> <div class="card-body">
<div class="form-group"> <div class="form-group">
<select multiple name="events" id="events_id" class="selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='event' %}"></select> <select multiple name="events" id="events_id" class="selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='event' %}">
{% if object.events.count > 0 %}
{% for event in object.events.all %}
<option value="{{event.id}}" selected>{{ event }}</option>
{% endfor %}
{% endif %}
</select>
</div> </div>
</div> </div>
</div> </div>