Skip to content

Commit db416e6

Browse files
authored
Feat: replace render with TemplateResponse (#1473)
1 parent 1d709ae commit db416e6

File tree

3 files changed

+20
-14
lines changed

3 files changed

+20
-14
lines changed

filer/admin/folderadmin.py

+8-7
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
from django.db.models import Case, F, OuterRef, Subquery, When
1717
from django.db.models.functions import Coalesce, Lower
1818
from django.http import HttpResponse, HttpResponseRedirect
19-
from django.shortcuts import get_object_or_404, render
19+
from django.shortcuts import get_object_or_404
20+
from django.template.response import TemplateResponse
2021
from django.urls import path, reverse
2122
from django.utils.encoding import force_str
2223
from django.utils.html import escape, format_html
@@ -480,7 +481,7 @@ def directory_listing(self, request, folder_id=None, viewtype=None):
480481
'enable_permissions': settings.FILER_ENABLE_PERMISSIONS,
481482
'can_make_folder': request.user.is_superuser or (folder.is_root and settings.FILER_ALLOW_REGULAR_USERS_TO_ADD_ROOT_FOLDERS) or permissions.get("has_add_children_permission"),
482483
})
483-
return render(request, self.directory_listing_template, context)
484+
return TemplateResponse(request, self.directory_listing_template, context)
484485

485486
def filter_folder(self, qs, terms=()):
486487
# Source: https://github.com/django/django/blob/1.7.1/django/contrib/admin/options.py#L939-L947 flake8: noqa
@@ -814,7 +815,7 @@ def delete_files_or_folders(self, request, files_queryset, folders_queryset):
814815
})
815816

816817
# Display the destination folder selection page
817-
return render(
818+
return TemplateResponse(
818819
request,
819820
"admin/filer/delete_selected_files_confirmation.html",
820821
context
@@ -954,7 +955,7 @@ def move_files_and_folders(self, request, files_queryset, folders_queryset):
954955
})
955956

956957
# Display the destination folder selection page
957-
return render(request, "admin/filer/folder/choose_move_destination.html", context)
958+
return TemplateResponse(request, "admin/filer/folder/choose_move_destination.html", context)
958959

959960
move_files_and_folders.short_description = _("Move selected files and/or folders")
960961

@@ -1037,7 +1038,7 @@ def rename_files(self, request, files_queryset, folders_queryset):
10371038
})
10381039

10391040
# Display the rename format selection page
1040-
return render(request, "admin/filer/folder/choose_rename_format.html", context)
1041+
return TemplateResponse(request, "admin/filer/folder/choose_rename_format.html", context)
10411042

10421043
rename_files.short_description = _("Rename files")
10431044

@@ -1169,7 +1170,7 @@ def copy_files_and_folders(self, request, files_queryset, folders_queryset):
11691170
})
11701171

11711172
# Display the destination folder selection page
1172-
return render(request, "admin/filer/folder/choose_copy_destination.html", context)
1173+
return TemplateResponse(request, "admin/filer/folder/choose_copy_destination.html", context)
11731174

11741175
copy_files_and_folders.short_description = _("Copy selected files and/or folders")
11751176

@@ -1298,6 +1299,6 @@ def resize_images(self, request, files_queryset, folders_queryset):
12981299
})
12991300

13001301
# Display the resize options page
1301-
return render(request, "admin/filer/folder/choose_images_resize_options.html", context)
1302+
return TemplateResponse(request, "admin/filer/folder/choose_images_resize_options.html", context)
13021303

13031304
resize_images.short_description = _("Resize selected images")

filer/admin/imageadmin.py

+9-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from django import forms
2-
from django.shortcuts import get_object_or_404, render
2+
from django.shortcuts import get_object_or_404
3+
from django.template.response import TemplateResponse
34
from django.urls import path
45
from django.utils.translation import gettext as _
56
from django.utils.translation import gettext_lazy
@@ -95,9 +96,13 @@ def get_urls(self):
9596

9697
def expand_view(self, request, file_id):
9798
image = get_object_or_404(self.model, pk=file_id)
98-
return render(request, "admin/filer/image/expand.html", context={
99-
"original_url": image.url
100-
})
99+
return TemplateResponse(
100+
request,
101+
"admin/filer/image/expand.html",
102+
context={
103+
"original_url": image.url
104+
},
105+
)
101106

102107

103108
if FILER_IMAGE_MODEL == 'filer.Image':

filer/admin/views.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from django.core.exceptions import PermissionDenied
66
from django.http import HttpResponseRedirect
77
from django.http.response import HttpResponseBadRequest
8-
from django.shortcuts import render
8+
from django.template.response import TemplateResponse
99
from django.utils.translation import gettext_lazy as _
1010

1111
from .. import settings as filer_settings
@@ -58,7 +58,7 @@ def make_folder(request, folder_id=None):
5858
new_folder.parent = folder
5959
new_folder.owner = request.user
6060
new_folder.save()
61-
return render(request, 'admin/filer/dismiss_popup.html', context)
61+
return TemplateResponse(request, 'admin/filer/dismiss_popup.html', context)
6262
else:
6363
new_folder_form = NewFolderForm()
6464

@@ -69,7 +69,7 @@ def make_folder(request, folder_id=None):
6969
'is_popup': popup_status(request),
7070
'filer_admin_context': AdminContext(request),
7171
})
72-
return render(request, 'admin/filer/folder/new_folder_form.html', context)
72+
return TemplateResponse(request, 'admin/filer/folder/new_folder_form.html', context)
7373

7474

7575
@login_required

0 commit comments

Comments
 (0)