me/breccia-mapper
1
0
Fork 0
mirror of https://github.com/Southampton-RSG/breccia-mapper.git synced 2026-03-03 19:37:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

[FEAT] Update dependencies

Browse Source 
Upgrade versions of most packages and make other required changes to ensure compatibility. Update database models and migrations to match new requirements set by Django
This commit is contained in:
Matthew Grove
2023-01-05 17:49:27 +00:00
parent 770b4f1114
commit 7e2491be76
24 changed files with 293 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
people/templates/people/map.html Normal file → Executable file
View File

@@ -3,7 +3,7 @@
{% block extra_head %}
{{ map_markers|json_script:'map-markers' }}
{% load staticfiles %}
{% load static %}
<script src="{% static 'js/map.js' %}"></script>
<script async defer

2
people/templates/people/network.html Normal file → Executable file
View File

@@ -97,6 +97,6 @@
integrity="sha512-Qlv6VSKh1gDKGoJbnyA5RMXYcvnpIqhO++MhIM2fStMcGT9i2T//tSwYFlcyoRRDcDZ+TYHpH8azBBCyhpSeqw=="
crossorigin="anonymous"></script>
{% load staticfiles %}
{% load static %}
<script src="{% static 'js/network.js' %}"></script>
{% endblock %}

2
people/templates/people/organisation/detail.html Normal file → Executable file
View File

@@ -3,7 +3,7 @@
{% block extra_head %}
{{ map_markers|json_script:'map-markers' }}
{% load staticfiles %}
{% load static %}
<script src="{% static 'js/map.js' %}"></script>
<script async defer src="https://maps.googleapis.com/maps/api/js?key={{ settings.GOOGLE_MAPS_API_KEY }}&callback=initMap"

2
people/templates/people/organisation/update.html Normal file → Executable file
View File

@@ -1,7 +1,7 @@
{% extends 'base.html' %}
{% block extra_head %}
{% load staticfiles %}
{% load static %}
{{ map_markers|json_script:'map-markers' }}
<script src="{% static 'js/map.js' %}"></script>

14
people/templates/people/person/detail_full.html Normal file → Executable file
View File

@@ -3,7 +3,7 @@
{% block extra_head %}
{{ map_markers|json_script:'map-markers' }}
{% load staticfiles %}
{% load static %}
<script src="{% static 'js/map.js' %}"></script>
<script async defer src="https://maps.googleapis.com/maps/api/js?key={{ settings.GOOGLE_MAPS_API_KEY }}&callback=initMap"
@@ -64,17 +64,19 @@
<a class="btn btn-success"
href="{% url 'people:person.update' pk=person.pk %}">Update</a>
{% load hijack_tags %}
{% if person.user == request.user and not request|is_hijacked %}
{% load hijack %}
{% if person.user == request.user and not request.user.is_hijacked %}
<a class="btn btn-info"
href="{% url 'password_change' %}?next={{ person.get_absolute_url }}">Change Password</a>
{% endif %}
{% if request.user.is_superuser and person.user and person.user != request.user %}
<form style="display: inline;" action="/hijack/{{ person.user.pk }}/" method="post">
{% csrf_token %}
<form action="{% url 'hijack:acquire' %}" method="POST">
{% csrf_token %}
<input type="hidden" name="user_pk" value="{{ person.pk }}">
<button class="btn btn-warning" type="submit">Become {{ person.name }}</button>
</form>
<input type="hidden" name="next" value="{{ request.path }}">
</form>
{% endif %}
<hr>

2
people/templates/people/person/detail_partial.html Normal file → Executable file
View File

@@ -3,7 +3,7 @@
{% block extra_head %}
{{ map_markers|json_script:'map-markers' }}
{% load staticfiles %}
{% load static %}
<script src="{% static 'js/map.js' %}"></script>
<script async defer src="https://maps.googleapis.com/maps/api/js?key={{ settings.GOOGLE_MAPS_API_KEY }}&callback=initMap"

2
people/templates/people/person/update.html Normal file → Executable file
View File

@@ -1,7 +1,7 @@
{% extends 'base.html' %}
{% block extra_head %}
{% load staticfiles %}
{% load static %}
{{ map_markers|json_script:'map-markers' }}
<script src="{% static 'js/map.js' %}"></script>

2
people/templates/people/relationship/update.html Normal file → Executable file
View File

@@ -23,6 +23,6 @@
{% endblock %}
{% block extra_script %}
{% load staticfiles %}
{% load static %}
<script async defer src="{% static 'js/hide_free_text.js' %}"></script>
{% endblock %}