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.

Sign up for GitHub

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

Bump django from 5.0.7 to 5.1 #693

Merged
merged 4 commits into from
Aug 21, 2024
Merged

Bump django from 5.0.7 to 5.1 #693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
62f373e
Bump django from 5.0.7 to 5.1
dependabot[bot] Aug 21, 2024
c14aeef
refactor: remove redundant template tag
MatMoore Aug 21, 2024
3415be5
fix: add missing migration file
MatMoore Aug 21, 2024
b36f291
Merge branch 'main' into dependabot/pip/django-5.1
mitchdawson1982 Aug 21, 2024
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
20 changes: 20 additions & 0 deletions feedback/migrations/0002_alter_feedback_how_can_we_improve.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Generated by Django 5.1 on 2024-08-21 09:39

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
("feedback", "0001_initial"),
]

operations = [
migrations.AlterField(
model_name="feedback",
name="how_can_we_improve",
field=models.TextField(
blank=True, verbose_name="How can we improve this service?"
),
),
]
38 changes: 0 additions & 38 deletions home/templatetags/future.py
View file
Open in desktop

This file was deleted.

12 changes: 6 additions & 6 deletions poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ readme = "README.md"

[tool.poetry.dependencies]
python = "^3.11"
django = "^5.0.7"
django = "^5.1"
django-prometheus = "^2.3.1"
pyyaml = "^6.0.2"
gunicorn = "^22.0.0"
Expand Down
3 changes: 1 addition & 2 deletions templates/details_base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
{% load static %}
{% load markdown %}
{% load humanize %}
{% load future %}
{% load waffle_tags %}
{% load i18n %}

Expand Down Expand Up @@ -77,7 +76,7 @@ <h3 class="govuk-heading-s govuk-!-margin-top-3">
<li>
<span class="govuk-!-font-weight-bold">Tags:</span>
{% for tag in entity.tags_to_display %}
<a aria-label="link to search results for all entities tagged {{ tag }}" href="{% url 'home:search' %}{% query_string clear_label=None clear_filter=None new=None tags=tag%}">{{ tag }}</a>{% if not forloop.last %}, {% endif %}
<a aria-label="link to search results for all entities tagged {{ tag }}" href="{% url 'home:search' %}{% querystring clear_label=None clear_filter=None new=None tags=tag%}">{{ tag }}</a>{% if not forloop.last %}, {% endif %}
{% endfor %}
</li>
{% endif %}
Expand Down
1 change: 0 additions & 1 deletion templates/partial/filter.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{% load future %}
{% load clear_filter %}
{% load i18n %}
<div class="govuk-grid-column-one-third">
Expand Down
7 changes: 3 additions & 4 deletions templates/partial/pagination.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
{% load future %}
{% load i18n %}
{% if results %}
<nav class="govuk-pagination" role="navigation" aria-label="Pagination">
{% if page_obj.has_previous %}
<div class="govuk-pagination__prev">
<a class="govuk-link govuk-pagination__link" href="{% url 'home:pagination' page=page_obj.previous_page_number %}{% query_string clear_label=None clear_filter=None %}" rel="prev">
<a class="govuk-link govuk-pagination__link" href="{% url 'home:pagination' page=page_obj.previous_page_number %}{% querystring clear_label=None clear_filter=None %}" rel="prev">
<svg class="govuk-pagination__icon govuk-pagination__icon--prev" xmlns="http://www.w3.org/2000/svg" height="13" width="15" aria-hidden="true" focusable="false" viewBox="0 0 15 13">
<path d="m6.5938-0.0078125-6.7266 6.7266 6.7441 6.4062 1.377-1.449-4.1856-3.9768h12.896v-2h-12.984l4.2931-4.293-1.414-1.414z"></path>
</svg>
Expand All @@ -20,7 +19,7 @@
{% else %}
<li class="govuk-pagination__item">
{% endif %}
<a class="govuk-link govuk-pagination__link" href="{% url 'home:pagination' page=p %}{% query_string clear_label=None clear_filter=None new=None %}" aria-label="Page {{ p }}">
<a class="govuk-link govuk-pagination__link" href="{% url 'home:pagination' page=p %}{% querystring clear_label=None clear_filter=None new=None %}" aria-label="Page {{ p }}">
{{ p }}
</a>
</li>
Expand All @@ -32,7 +31,7 @@
</ul>
{% if page_obj.has_next %}
<div class="govuk-pagination__next">
<a class="govuk-link govuk-pagination__link" href="{% url 'home:pagination' page=page_obj.next_page_number %}{% query_string clear_label=None clear_filter=None value=None new=None %}" rel="next"> <span class="govuk-pagination__link-title">{% blocktranslate %}Next<span class="govuk-visually-hidden"> page</span>{% endblocktranslate %}</span> <svg class="govuk-pagination__icon govuk-pagination__icon--next" xmlns="http://www.w3.org/2000/svg" height="13" width="15" aria-hidden="true" focusable="false" viewBox="0 0 15 13">
<a class="govuk-link govuk-pagination__link" href="{% url 'home:pagination' page=page_obj.next_page_number %}{% querystring clear_label=None clear_filter=None value=None new=None %}" rel="next"> <span class="govuk-pagination__link-title">{% blocktranslate %}Next<span class="govuk-visually-hidden"> page</span>{% endblocktranslate %}</span> <svg class="govuk-pagination__icon govuk-pagination__icon--next" xmlns="http://www.w3.org/2000/svg" height="13" width="15" aria-hidden="true" focusable="false" viewBox="0 0 15 13">
<path d="m8.107-0.0078125-1.4136 1.414 4.2926 4.293h-12.986v2h12.896l-4.1855 3.9766 1.377 1.4492 6.7441-6.4062-6.7246-6.7266z"></path>
</svg></a>
</div>
Expand Down
3 changes: 1 addition & 2 deletions templates/partial/search_result.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{% load markdown %}
{% load humanize %}
{% load future %}
{% load waffle_tags %}
{% load i18n %}

Expand Down Expand Up @@ -52,7 +51,7 @@ <h3 class="govuk-heading-m govuk-!-margin-bottom-2">
<span>
{% if result.tags_to_display %}
{% for tag in result.tags_to_display %}
<a aria-label="link to search results for all entities tagged {{ tag }}" href="{% url 'home:search' %}{% query_string clear_label=None clear_filter=None new=None tags=tag %}">{{ tag }}</a>{% if not forloop.last %}, {% endif %}
<a aria-label="link to search results for all entities tagged {{ tag }}" href="{% url 'home:search' %}{% querystring clear_label=None clear_filter=None new=None tags=tag %}">{{ tag }}</a>{% if not forloop.last %}, {% endif %}
{% endfor %}
{% endif %}
</span>
Expand Down
3 changes: 1 addition & 2 deletions templates/partial/selected_filters.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{% load future %}
{% load clear_filter %}
{% load i18n %}

Expand All @@ -11,7 +10,7 @@ <h2 class="govuk-heading-m">{% translate "Selected filters" %}</h2>
<p>
{% if remove_filter_hrefs|get_keys|length > 0 %}
<a class="govuk-link govuk-link--no-visited-state"
href="{% url 'home:search' %}{% query_string domain=None entity_types=None where_to_access=None tags=None%}"
href="{% url 'home:search' %}{% querystring domain=None entity_types=None where_to_access=None tags=None%}"
id="clear_filter">
{% translate "Clear filter" %}
</a>
Expand Down
Loading