Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade django to the LTS version #3405

Merged
merged 2 commits into from
Jul 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bims/request_log/mixin.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ class RequestLogViewMixin(object):
@classmethod
def as_view(cls, *args, **kwargs):
view = super(RequestLogViewMixin, cls).as_view(*args, **kwargs)
view = decorator_from_middleware(RequestLogMiddleware)(view)
view = decorator_from_middleware(RequestLogMiddleware)
return view
2 changes: 1 addition & 1 deletion bims/templates/abiotic/abiotic_form.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'main_base.html' %}
{% load static from staticfiles %}
{% load static %}
{% block subtitle %}
Abiotic Form
{% endblock %}
Expand Down
2 changes: 1 addition & 1 deletion bims/templates/account/admin_approval_sent.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% extends 'main_base.html' %}
{% load i18n %}
{% load account %}
{% load static from staticfiles %}
{% load static %}

{% block subtitle %}Account Pending Approval{% endblock %}
{% block head %}
Expand Down
2 changes: 1 addition & 1 deletion bims/templates/account/email_confirm.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% load i18n %}
{% load account %}
{% load static from staticfiles %}
{% load static %}

{% block css_head %}
<!-- Chosen library -->
Expand Down
2 changes: 1 addition & 1 deletion bims/templates/account/login.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% extends 'main_base.html' %}
{% load i18n %}
{% load account %}
{% load static from staticfiles %}
{% load static %}

{% block subtitle %}Login{% endblock %}

Expand Down
2 changes: 1 addition & 1 deletion bims/templates/account/logout.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% extends 'main_base.html' %}
{% load i18n %}
{% load account %}
{% load static from staticfiles %}
{% load static %}

{% block subtitle %}Logout{% endblock %}

Expand Down
2 changes: 1 addition & 1 deletion bims/templates/account/password_change.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% extends 'main_base.html' %}
{% load i18n %}
{% load account %}
{% load static from staticfiles %}
{% load static %}
{% load bootstrap_tags %}

{% block subtitle %}Password change{% endblock %}
Expand Down
2 changes: 1 addition & 1 deletion bims/templates/backups_management.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'main_base.html' %}
{% load static from staticfiles %}
{% load static %}
{% block subtitle %}
Backups management
{% endblock %}
Expand Down
2 changes: 1 addition & 1 deletion bims/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
---------------------------------------------------------------------- -->

{% load i18n avatar_tags %}
{% load static from staticfiles %}
{% load static %}
{% load account %}
{% load base_tags %}
<!DOCTYPE html>
Expand Down
2 changes: 1 addition & 1 deletion bims/templates/bims/blog_page.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'main_base.html' %}
{% load static from staticfiles %}
{% load static %}
{% load wagtailcore_tags %}
{% load wagtailimages_tags %}
{% load jsonify %}
Expand Down
2 changes: 1 addition & 1 deletion bims/templates/bims/content_page.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'main_base.html' %}
{% load static from staticfiles %}
{% load static %}
{% load wagtailcore_tags %}
{% load jsonify %}

Expand Down
2 changes: 1 addition & 1 deletion bims/templates/bims/manual_page.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'main_base.html' %}
{% load static from staticfiles %}
{% load static %}
{% load manual_menu %}
{% load wagtailcore_tags %}

Expand Down
2 changes: 1 addition & 1 deletion bims/templates/bio_records_update.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'main_base.html' %}
{% load static from staticfiles %}
{% load static %}
{% load crispy_forms_tags %}

{% block title %}
Expand Down
2 changes: 1 addition & 1 deletion bims/templates/collections_form_page.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'main_base.html' %}
{% load static from staticfiles %}
{% load static %}
{% block subtitle %}
{{ taxon_group_name }} Form
{% endblock %}
Expand Down
2 changes: 1 addition & 1 deletion bims/templates/collections_uploader.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'main_base.html' %}
{% load static from staticfiles %}
{% load static %}

{% block subtitle %}
Collections Uploader
Expand Down
2 changes: 1 addition & 1 deletion bims/templates/contactus/contact.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'main_base.html' %}
{% load static from staticfiles %}
{% load static %}
{% load i18n %}

{% block subtitle %}
Expand Down
2 changes: 1 addition & 1 deletion bims/templates/csv_uploader.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'main_base.html' %}
{% load static from staticfiles %}
{% load static %}

{% block subtitle %}
Uploader
Expand Down
2 changes: 1 addition & 1 deletion bims/templates/dashboard_management.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'main_base.html' %}
{% load static from staticfiles %}
{% load static %}
{% block subtitle %}
Dashboard management
{% endblock %}
Expand Down
2 changes: 1 addition & 1 deletion bims/templates/documents/bims_document_update.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'main_base.html' %}
{% load static from staticfiles %}
{% load static %}
{% load crispy_forms_tags %}

{% block title %}
Expand Down
2 changes: 1 addition & 1 deletion bims/templates/documents/document_base.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends "geonode_base.html" %}
{% load static from staticfiles %}
{% load static %}
{% load i18n %}

{% block title %} {{ block.super }} {% endblock %}
Expand Down
2 changes: 1 addition & 1 deletion bims/templates/documents/document_upload_base.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends "geonode_base.html" %}
{% load static from staticfiles %}
{% load static %}
{% load i18n %}
{% load base_tags %}
{% load guardian_tags %}
Expand Down
2 changes: 1 addition & 1 deletion bims/templates/download_request_list.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% extends 'main_base.html' %}
{% load jsonify %}
{% load static from staticfiles %}
{% load static %}
{% load site %}

{% block subtitle %}
Expand Down
2 changes: 1 addition & 1 deletion bims/templates/edit_source_reference.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'main_base.html' %}
{% load static from staticfiles %}
{% load static %}

{% block subtitle %}
Edit Source Reference
Expand Down
2 changes: 1 addition & 1 deletion bims/templates/fbis/navigation_bar.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% load static from staticfiles %}
{% load static %}
<link href="https://fonts.googleapis.com/css?family=Alegreya:400,400i,500,500i,700,700i|Roboto+Condensed:100,100i,300,300i,400,400i,500,500i,700,700i" rel="stylesheet">
<style>
body {
Expand Down
2 changes: 1 addition & 1 deletion bims/templates/flatpages/default.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'main_base.html' %}
{% load static from staticfiles %}
{% load static %}

{% block title %}
About Us
Expand Down
2 changes: 1 addition & 1 deletion bims/templates/harvest_collection.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'main_base.html' %}
{% load static from staticfiles %}
{% load static %}

{% block subtitle %}
Taxa Uploader
Expand Down
2 changes: 1 addition & 1 deletion bims/templates/includes/overview_table.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

{% load static from staticfiles %}
{% load static %}
<div class="table-container">
<div class="table-title">Overview
<i data-download-title="Overview"
Expand Down
2 changes: 1 addition & 1 deletion bims/templates/includes/site_image_carousel.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% load static from staticfiles %}
{% load static %}
{% load thumbnail %}
<style>
.site-image-date-container {
Expand Down
2 changes: 1 addition & 1 deletion bims/templates/landing_page.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'main_base.html' %}
{% load static from staticfiles %}
{% load static %}
{% load jsonify %}

{% block subtitle %}
Expand Down
2 changes: 1 addition & 1 deletion bims/templates/landing_page_fbis.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'main_base.html' %}
{% load static from staticfiles %}
{% load static %}

{% block subtitle %}
Home
Expand Down
2 changes: 1 addition & 1 deletion bims/templates/links/links.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'main_base.html' %}
{% load static from staticfiles %}
{% load static %}

{% block subtitle %}
Links
Expand Down
2 changes: 1 addition & 1 deletion bims/templates/location_site_detail.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'main_base.html' %}
{% load static from staticfiles %}
{% load static %}
{% load thumbnail %}
{% block subtitle %}
Location Site Form
Expand Down
2 changes: 1 addition & 1 deletion bims/templates/location_site_form_view.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'main_base.html' %}
{% load static from staticfiles %}
{% load static %}
{% load thumbnail %}
{% block subtitle %}
Location Site Form
Expand Down
2 changes: 1 addition & 1 deletion bims/templates/main_base.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% load static from staticfiles %}
{% load static %}
{% load pipeline %}
{% load grunt %}
{% load site %}
Expand Down
2 changes: 1 addition & 1 deletion bims/templates/map_page/bims.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'main_base.html' %}
{% load static from staticfiles %}
{% load static %}
{% load grunt %}
{% load jsonify %}

Expand Down
2 changes: 1 addition & 1 deletion bims/templates/map_page/map-templates.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% load static from staticfiles %}
{% load static %}
<!-- IntroJs -->
<link href="https://cdnjs.cloudflare.com/ajax/libs/intro.js/2.9.3/introjs.min.css" rel="stylesheet">
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/intro.js/2.9.3/intro.min.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion bims/templates/metadata_base.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{% load bootstrap_tags %}
{% load base_tags %}
{% load guardian_tags %}
{% load static from staticfiles %}
{% load static %}


{% block head %}
Expand Down
2 changes: 1 addition & 1 deletion bims/templates/non_validated_list.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'main_base.html' %}
{% load static from staticfiles %}
{% load static %}

{% block title %}
Validation
Expand Down
2 changes: 1 addition & 1 deletion bims/templates/non_validated_location_site.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'main_base.html' %}
{% load static from staticfiles %}
{% load static %}

{% block title %}
Site Validation
Expand Down
2 changes: 1 addition & 1 deletion bims/templates/non_validated_user_list.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'main_base.html' %}
{% load static from staticfiles %}
{% load static %}

{% block title %}
Nonvalidated Records
Expand Down
2 changes: 1 addition & 1 deletion bims/templates/people/profile_bims_base.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends "geonode_base.html" %}
{% load static from staticfiles %}
{% load static %}
{% load i18n %}

{% block title %} {{ block.super }} {% endblock %}
Expand Down
2 changes: 1 addition & 1 deletion bims/templates/physico_chemical_form.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'main_base.html' %}
{% load static from staticfiles %}
{% load static %}
{% block subtitle %}
Physico-Chemical Form
{% endblock %}
Expand Down
2 changes: 1 addition & 1 deletion bims/templates/physico_chemical_single_site.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% extends 'main_base.html' %}
{% load jsonify %}
{% load static from staticfiles %}
{% load static %}
{% load thumbnail %}

{% block subtitle %}
Expand Down
2 changes: 1 addition & 1 deletion bims/templates/physico_chemical_uploader.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'main_base.html' %}
{% load static from staticfiles %}
{% load static %}

{% block subtitle %}
Collections Uploader
Expand Down
2 changes: 1 addition & 1 deletion bims/templates/shapefile_uploader.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'main_base.html' %}
{% load static from staticfiles %}
{% load static %}

{% block subtitle %}
Uploader
Expand Down
2 changes: 1 addition & 1 deletion bims/templates/site_visit/site_visit_detail.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'main_base.html' %}
{% load static from staticfiles %}
{% load static %}
{% block subtitle %}
{{ taxon_group.name }} Form
{% endblock %}
Expand Down
2 changes: 1 addition & 1 deletion bims/templates/site_visit/site_visit_list.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'main_base.html' %}
{% load static from staticfiles %}
{% load static %}
{% load site_visit_extras %}
{% block subtitle %}
Site visit list
Expand Down
2 changes: 1 addition & 1 deletion bims/templates/site_visit/site_visit_update.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'main_base.html' %}
{% load static from staticfiles %}
{% load static %}
{% block subtitle %}
{{ taxon_group.name }} Form
{% endblock %}
Expand Down
2 changes: 1 addition & 1 deletion bims/templates/socialaccount/base.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends "geonode_base.html" %}
{% load static from staticfiles %}
{% load static %}
{% block header %}
<link href="{% static "js/libs/bootstrap-4.0.0/css/bootstrap.min.css" %}"
rel="stylesheet">
Expand Down
2 changes: 1 addition & 1 deletion bims/templates/source_reference_list.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'main_base.html' %}
{% load static from staticfiles %}
{% load static %}

{% block subtitle %}
Source References
Expand Down
2 changes: 1 addition & 1 deletion bims/templates/source_references/add_source_reference.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'main_base.html' %}
{% load static from staticfiles %}
{% load static %}

{% block subtitle %}
Add Source Reference
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'main_base.html' %}
{% load static from staticfiles %}
{% load static %}
{% block subtitle %}
Source Reference
{% endblock %}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% load static from staticfiles %}
{% load static %}
<link href="{% static "lib/pagination/bs-pagination.min.css" %}" rel="stylesheet"/>
<link rel="stylesheet"
href="{% static "lib/select2-4.1.0/css/select2.min.css" %}">
Expand Down
2 changes: 1 addition & 1 deletion bims/templates/summary_report.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'main_base.html' %}
{% load static from staticfiles %}
{% load static %}
{% block subtitle %}
Summary report
{% endblock %}
Expand Down
2 changes: 1 addition & 1 deletion bims/templates/survey_list.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% extends 'main_base.html' %}
{% load render_table from django_tables2 %}
{% load static from staticfiles %}
{% load static %}

{% block title %}
Nonvalidated Records
Expand Down
Loading
Loading