Merge remote-tracking branch 'origin/main'

# Conflicts:
#	templates/blocks/profile/b_new_route.html
This commit is contained in:
2023-08-29 13:54:15 +03:00
4 changed files with 24 additions and 3 deletions

View File

@@ -63,7 +63,7 @@
<input
type="datetime-local"
min="{% now "Y-m-d" %}T{% now "H:i" %}"
min= {{ now|date:"Y-m-d" }}T{{ now|date:"H:i" }}
name="departure_DT"
{% if form.fields.departure_DT.required %} required{% endif %}
id="id_departure_DT"

View File

@@ -45,6 +45,7 @@
<div>{{ route.get_cargo_type_display }}</div>
<div>{{ route.weight }}</div>
<div>{{ route.get_owner_type_display }}</div>
<div>{{ forloop.counter }}</div>
</a>
</div>
{% if route.owner != user %}