Skip to content

Commit 20577f8

Browse files
committed
Merge branch 'dev' into errors/DoesNotExist
2 parents 1e6486a + 3d739f3 commit 20577f8

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

bil_site/settings.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@
8585
'django_filters',
8686
'bootstrap4',
8787
'django_pam',
88+
'hijack',
89+
'hijack.contrib.admin',
8890
#'core',
8991
]
9092

@@ -96,6 +98,7 @@
9698
'django.contrib.auth.middleware.AuthenticationMiddleware',
9799
'django.contrib.messages.middleware.MessageMiddleware',
98100
'django.middleware.clickjacking.XFrameOptionsMiddleware',
101+
'hijack.middleware.HijackUserMiddleware',
99102
]
100103

101104
ROOT_URLCONF = 'bil_site.urls'

bil_site/urls.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,5 @@
2525
path('admin/', admin.site.urls),
2626
path('accounts/', include('django.contrib.auth.urls')),
2727
path('', RedirectView.as_view(url='/ingest/')),
28+
path('hijack/', include('hijack.urls')),
2829
] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)

requirements.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
amqp==5.0.9
2-
asgiref==3.3.2
2+
asgiref==3.5.2
33
asn1crypto==0.24.0
4-
#backports.zoneinfo==0.2.1
54
bcrypt==3.1.4
65
beautifulsoup4==4.9.3
76
billiard==3.6.4.0
@@ -12,10 +11,11 @@ click-didyoumean==0.3.0
1211
click-plugins==1.1.1
1312
click-repl==0.2.0
1413
cryptography==3.3.2
15-
Django==3.2.13
14+
Django==3.2.18
1615
django-bootstrap4==2.3.1
1716
django-celery-results==2.0.0
1817
django-filter==2.4.0
18+
django-hijack==3.2.6
1919
django-pam==2.0.0
2020
django-tables2==2.3.4
2121
et-xmlfile==1.0.1
@@ -48,9 +48,9 @@ six==1.11.0
4848
soupsieve==2.2.1
4949
sqlparse==0.4.2
5050
texttable==1.2.1
51+
tzdata==2022.1
5152
vine==5.0.0
5253
wcwidth==0.2.5
5354
xlrd==1.2.0
5455
xlwt==1.3.0
5556
zipp==3.4.1
56-
tzdata==2022.1

0 commit comments

Comments
 (0)