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

Now it is working in django 4.0 also #12

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
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
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Welcome to django-admin-filter

.. image:: https://img.shields.io/badge/django-2.2%20%7C%203.0%20%7C%203.1%20%7C%203.2-orange
:target: https://img.shields.io/badge/django-2.2%20%7C%203.0%20%7C%203.1%20%7C%203.2-orange
:alt: django: 2.2, 3.0, 3.1, 3.2
:alt: django: 2.2, 3.0, 3.1, 3.2, 4.0,

.. _django-filter: https://github.com/carltongibson/django-filter
.. _django-filter-docs: https://django-filter.readthedocs.io/en/master/
Expand Down Expand Up @@ -130,4 +130,4 @@ model::

"Can handle global FilterQueries"

Users with this permission can commonly create edit and delete global filters.
Users with this permission can commonly create edit and delete global filters.
8 changes: 4 additions & 4 deletions django_admin_filter/migrations/0001_initial.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ class Migration(migrations.Migration):

initial = True

dependencies = [
('contenttypes', '0002_remove_content_type_name'),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]
# dependencies = [
# ('contenttypes', '0002_remove_content_type_name'),
# migrations.swappable_dependency(settings.AUTH_USER_MODEL),
# ]

operations = [
migrations.CreateModel(
Expand Down
6 changes: 5 additions & 1 deletion django_admin_filter/urls.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
from django.conf.urls import re_path
try:
from django.conf.urls import re_path
except:
# For django 4
from django.urls import re_path
from .views import CreateFilterQueryView, UpdateFilterQueryView
from . import settings

Expand Down