mirror of
https://github.com/ajurna/cbwebreader.git
synced 2025-12-06 14:17:19 +00:00
removed request context from render contexts
This commit is contained in:
@@ -25,12 +25,12 @@ def comic_list(request, comic_path=''):
|
|||||||
comic_path = urlsafe_base64_decode(comic_path).decode()
|
comic_path = urlsafe_base64_decode(comic_path).decode()
|
||||||
title = generate_title_from_path(comic_path)
|
title = generate_title_from_path(comic_path)
|
||||||
files = ComicBook.generate_directory(request.user, base_dir, comic_path)
|
files = ComicBook.generate_directory(request.user, base_dir, comic_path)
|
||||||
context = RequestContext(request, {
|
context = {
|
||||||
'file_list': files,
|
'file_list': files,
|
||||||
'breadcrumbs': generate_breadcrumbs_from_path(comic_path),
|
'breadcrumbs': generate_breadcrumbs_from_path(comic_path),
|
||||||
'menu': Menu(request.user, 'Browse'),
|
'menu': Menu(request.user, 'Browse'),
|
||||||
'title': title,
|
'title': title,
|
||||||
})
|
}
|
||||||
return render(request, 'comic/comic_list.html', context)
|
return render(request, 'comic/comic_list.html', context)
|
||||||
|
|
||||||
|
|
||||||
@@ -55,14 +55,14 @@ def account_page(request):
|
|||||||
crumbs = [
|
crumbs = [
|
||||||
('Account', '/comic/account/'),
|
('Account', '/comic/account/'),
|
||||||
]
|
]
|
||||||
context = RequestContext(request, {
|
context = {
|
||||||
'form': form,
|
'form': form,
|
||||||
'menu': Menu(request.user, 'Account'),
|
'menu': Menu(request.user, 'Account'),
|
||||||
'error_message': form.errors,
|
'error_message': form.errors,
|
||||||
'success_message': '</br>'.join(success_message),
|
'success_message': '</br>'.join(success_message),
|
||||||
'breadcrumbs': generate_breadcrumbs_from_menu(crumbs),
|
'breadcrumbs': generate_breadcrumbs_from_menu(crumbs),
|
||||||
'title': 'CBWebReader - Account',
|
'title': 'CBWebReader - Account',
|
||||||
})
|
}
|
||||||
return render(request, 'comic/settings_page.html', context)
|
return render(request, 'comic/settings_page.html', context)
|
||||||
|
|
||||||
|
|
||||||
@@ -72,11 +72,11 @@ def users_page(request):
|
|||||||
crumbs = [
|
crumbs = [
|
||||||
('Users', '/comic/settings/users/'),
|
('Users', '/comic/settings/users/'),
|
||||||
]
|
]
|
||||||
context = RequestContext(request, {
|
context = {
|
||||||
'users': users,
|
'users': users,
|
||||||
'menu': Menu(request.user, 'Users'),
|
'menu': Menu(request.user, 'Users'),
|
||||||
'breadcrumbs': generate_breadcrumbs_from_menu(crumbs),
|
'breadcrumbs': generate_breadcrumbs_from_menu(crumbs),
|
||||||
})
|
}
|
||||||
return render(request, 'comic/users_page.html', context)
|
return render(request, 'comic/users_page.html', context)
|
||||||
|
|
||||||
|
|
||||||
@@ -103,7 +103,7 @@ def user_config_page(request, user_id):
|
|||||||
('Users', '/comic/settings/users/'),
|
('Users', '/comic/settings/users/'),
|
||||||
(user.username, '/comic/settings/users/' + str(user.id)),
|
(user.username, '/comic/settings/users/' + str(user.id)),
|
||||||
]
|
]
|
||||||
context = RequestContext(request, {
|
context = {
|
||||||
'form': form,
|
'form': form,
|
||||||
'users': users,
|
'users': users,
|
||||||
'menu': Menu(request.user, 'Users'),
|
'menu': Menu(request.user, 'Users'),
|
||||||
@@ -111,7 +111,7 @@ def user_config_page(request, user_id):
|
|||||||
'breadcrumbs': generate_breadcrumbs_from_menu(crumbs),
|
'breadcrumbs': generate_breadcrumbs_from_menu(crumbs),
|
||||||
'success_message': '</br>'.join(success_message),
|
'success_message': '</br>'.join(success_message),
|
||||||
'title': 'CBWebReader - Edit User - ' + user.username,
|
'title': 'CBWebReader - Edit User - ' + user.username,
|
||||||
})
|
}
|
||||||
return render(request, 'comic/settings_page.html', context)
|
return render(request, 'comic/settings_page.html', context)
|
||||||
|
|
||||||
|
|
||||||
@@ -135,14 +135,14 @@ def user_add_page(request):
|
|||||||
('Users', '/comic/settings/users/'),
|
('Users', '/comic/settings/users/'),
|
||||||
('Add', '/comic/settings/users/add/'),
|
('Add', '/comic/settings/users/add/'),
|
||||||
]
|
]
|
||||||
context = RequestContext(request, {
|
context = {
|
||||||
'form': form,
|
'form': form,
|
||||||
'menu': Menu(request.user, 'Users'),
|
'menu': Menu(request.user, 'Users'),
|
||||||
'breadcrumbs': generate_breadcrumbs_from_menu(crumbs),
|
'breadcrumbs': generate_breadcrumbs_from_menu(crumbs),
|
||||||
'error_message': form.errors,
|
'error_message': form.errors,
|
||||||
'success_message': success_message,
|
'success_message': success_message,
|
||||||
'title': 'CBWebReader - Add User',
|
'title': 'CBWebReader - Add User',
|
||||||
})
|
}
|
||||||
return render(request, 'comic/settings_page.html', context)
|
return render(request, 'comic/settings_page.html', context)
|
||||||
|
|
||||||
|
|
||||||
@@ -199,14 +199,14 @@ def read_comic(request, comic_path, page):
|
|||||||
status.last_read_page = page
|
status.last_read_page = page
|
||||||
status.save()
|
status.save()
|
||||||
title = 'CBWebReader - ' + book.file_name + ' - Page: ' + str(page)
|
title = 'CBWebReader - ' + book.file_name + ' - Page: ' + str(page)
|
||||||
context = RequestContext(request, {
|
context = {
|
||||||
'book': book,
|
'book': book,
|
||||||
'orig_file_name': book.page_name(page),
|
'orig_file_name': book.page_name(page),
|
||||||
'nav': book.nav(comic_path, page),
|
'nav': book.nav(comic_path, page),
|
||||||
'breadcrumbs': breadcrumbs,
|
'breadcrumbs': breadcrumbs,
|
||||||
'menu': Menu(request.user),
|
'menu': Menu(request.user),
|
||||||
'title': title,
|
'title': title,
|
||||||
})
|
}
|
||||||
return render(request, 'comic/read_comic.html', context)
|
return render(request, 'comic/read_comic.html', context)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -34,9 +34,9 @@ def comic_login(request):
|
|||||||
if not User.objects.all().exists():
|
if not User.objects.all().exists():
|
||||||
return redirect('/setup/')
|
return redirect('/setup/')
|
||||||
form = LoginForm()
|
form = LoginForm()
|
||||||
context = RequestContext(request, {
|
context = {
|
||||||
'form': form
|
'form': form
|
||||||
})
|
}
|
||||||
return render(request, 'comic_auth/login.html', context)
|
return render(request, 'comic_auth/login.html', context)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user