Skip to content

Commit 1eb3d49

Browse files
upgraded django version to 5.1.10
1 parent 7ee2fc2 commit 1eb3d49

File tree

4 files changed

+22
-5
lines changed

4 files changed

+22
-5
lines changed

web/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
Django==5.0
2-
djangorestframework==3.16.0
1+
Django==5.1.10
2+
djangorestframework==3.16.1
33
django-filter==25.1
44
Markdown
55
gunicorn

web/settings.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,3 +195,6 @@
195195

196196
# CSRF trusted origins
197197
CSRF_TRUSTED_ORIGINS = os.getenv("DJANGO_CSRF_TRUSTED_ORIGINS", "").split(",")
198+
199+
# To direct django admin login into the built-in admin login page
200+
LOGIN_URL = '/admin/login/'

web/urls.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from django.contrib import admin
33
from django.views.generic.base import RedirectView
44
from django.urls import path
5+
from views import DRFLoginView
56

67
admin.autodiscover()
78

@@ -10,6 +11,7 @@
1011
path('admin/', admin.site.urls),
1112
path('api/', include('services.urls')),
1213
# should be in services/urls.py
14+
path('api-auth/login/', DRFLoginView.as_view(), name="rest_login"),
1315
path('api-auth/', include('rest_framework.urls',
1416
namespace='rest_framework')),
1517
path('', RedirectView.as_view(url='/api/', permanent=True))

web/views.py

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
1-
from django.shortcuts import render_to_response
2-
1+
from django.shortcuts import render
2+
from django.contrib.auth.views import LoginView
33

44
def home(request):
5-
return render_to_response('home/home.html')
5+
return render(request, 'home/home.html')
6+
7+
class DRFLoginView(LoginView):
8+
template_name = "rest_framework/login.html"
9+
10+
def get(self, request, *args, **kwargs):
11+
context = {
12+
'form': self.get_form(),
13+
'next': request.GET.get('next', ''),
14+
'name': 'Login',
15+
'code_style': 'friendly',
16+
}
17+
return render(request, self.template_name, context)

0 commit comments

Comments
 (0)