Skip to content

Commit e5d6311

Browse files
Remove login_url from all login_required decorators
- Let login_url be handled by project level settings
1 parent b838f81 commit e5d6311

2 files changed

Lines changed: 19 additions & 18 deletions

File tree

example_project/settings.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,8 @@
133133

134134
# PunkwebBB
135135

136+
LOGIN_URL = "punkweb_bb:login"
137+
136138
PUNKWEB_BB = {
137139
"PARSER": "bbcode",
138140
}

punkweb_bb/views.py

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from django import forms
21
from django.contrib.auth import authenticate, get_user_model, login, logout
32
from django.contrib.auth.decorators import login_required, permission_required
43
from django.core.exceptions import PermissionDenied
@@ -175,7 +174,7 @@ def members_view(request):
175174
return render(request, "punkweb_bb/members.html", context=context)
176175

177176

178-
@login_required(login_url="/login/")
177+
@login_required()
179178
def settings_view(request):
180179
if request.method == "POST":
181180
form = BoardProfileModelForm(
@@ -198,7 +197,7 @@ def settings_view(request):
198197
return render(request, "punkweb_bb/settings.html", context=context)
199198

200199

201-
@login_required(login_url="/login/")
200+
@login_required()
202201
@permission_required("punkweb_bb.view_category", raise_exception=True)
203202
def category_create_view(request):
204203
if request.method == "POST":
@@ -219,7 +218,7 @@ def category_create_view(request):
219218
return render(request, "punkweb_bb/category_create.html", context=context)
220219

221220

222-
@login_required(login_url="/login/")
221+
@login_required()
223222
@permission_required("punkweb_bb.change_category", raise_exception=True)
224223
def category_update_view(request, category_slug):
225224
category = get_object_or_404(Category, slug=category_slug)
@@ -241,7 +240,7 @@ def category_update_view(request, category_slug):
241240
return render(request, "punkweb_bb/category_update.html", context=context)
242241

243242

244-
@login_required(login_url="/login/")
243+
@login_required()
245244
@permission_required("punkweb_bb.delete_category", raise_exception=True)
246245
def category_delete_view(request, category_slug):
247246
category = get_object_or_404(Category, slug=category_slug)
@@ -270,7 +269,7 @@ def subcategory_view(request, subcategory_slug):
270269
return render(request, "punkweb_bb/subcategory.html", context=context)
271270

272271

273-
@login_required(login_url="/login/")
272+
@login_required()
274273
@permission_required("punkweb_bb.add_subcategory", raise_exception=True)
275274
def subcategory_create_view(request, category_slug):
276275
category = get_object_or_404(Category, slug=category_slug)
@@ -295,7 +294,7 @@ def subcategory_create_view(request, category_slug):
295294
return render(request, "punkweb_bb/subcategory_create.html", context=context)
296295

297296

298-
@login_required(login_url="/login/")
297+
@login_required()
299298
@permission_required("punkweb_bb.change_subcategory", raise_exception=True)
300299
def subcategory_update_view(request, subcategory_slug):
301300
subcategory = get_object_or_404(Subcategory, slug=subcategory_slug)
@@ -317,7 +316,7 @@ def subcategory_update_view(request, subcategory_slug):
317316
return render(request, "punkweb_bb/subcategory_update.html", context=context)
318317

319318

320-
@login_required(login_url="/login/")
319+
@login_required()
321320
@permission_required("punkweb_bb.delete_subcategory", raise_exception=True)
322321
def subcategory_delete_view(request, subcategory_slug):
323322
subcategory = get_object_or_404(Subcategory, slug=subcategory_slug)
@@ -336,7 +335,7 @@ def subcategory_delete_view(request, subcategory_slug):
336335
)
337336

338337

339-
@login_required(login_url="/login/")
338+
@login_required()
340339
def thread_create_view(request, subcategory_slug):
341340
subcategory = get_object_or_404(Subcategory, slug=subcategory_slug)
342341

@@ -384,7 +383,7 @@ def thread_view(request, thread_id):
384383
return render(request, "punkweb_bb/thread.html", context=context)
385384

386385

387-
@login_required(login_url="/login/")
386+
@login_required()
388387
def thread_update_view(request, thread_id):
389388
thread = get_object_or_404(Thread, pk=thread_id)
390389

@@ -407,7 +406,7 @@ def thread_update_view(request, thread_id):
407406
return render(request, "punkweb_bb/thread_update.html", context=context)
408407

409408

410-
@login_required(login_url="/login/")
409+
@login_required()
411410
def thread_delete_view(request, thread_id):
412411
thread = get_object_or_404(Thread, pk=thread_id)
413412

@@ -425,7 +424,7 @@ def thread_delete_view(request, thread_id):
425424
return render(request, "punkweb_bb/partials/thread_delete.html", context=context)
426425

427426

428-
@login_required(login_url="/login/")
427+
@login_required()
429428
@permission_required("punkweb_bb.pin_thread", raise_exception=True)
430429
def thread_pin_view(request, thread_id):
431430
thread = get_object_or_404(Thread, pk=thread_id)
@@ -436,7 +435,7 @@ def thread_pin_view(request, thread_id):
436435
return htmx_redirect(thread.get_absolute_url())
437436

438437

439-
@login_required(login_url="/login/")
438+
@login_required()
440439
@permission_required("punkweb_bb.close_thread", raise_exception=True)
441440
def thread_close_view(request, thread_id):
442441
thread = get_object_or_404(Thread, pk=thread_id)
@@ -447,7 +446,7 @@ def thread_close_view(request, thread_id):
447446
return htmx_redirect(thread.get_absolute_url())
448447

449448

450-
@login_required(login_url="/login/")
449+
@login_required()
451450
@permission_required("punkweb_bb.move_thread", raise_exception=True)
452451
def thread_move_view(request, thread_id):
453452
thread = get_object_or_404(Thread, pk=thread_id)
@@ -475,7 +474,7 @@ def thread_move_view(request, thread_id):
475474
return render(request, "punkweb_bb/partials/thread_move.html", context=context)
476475

477476

478-
@login_required(login_url="/login/")
477+
@login_required()
479478
def post_create_view(request, thread_id):
480479
thread = get_object_or_404(Thread, pk=thread_id)
481480

@@ -492,7 +491,7 @@ def post_create_view(request, thread_id):
492491
return redirect(post)
493492

494493

495-
@login_required(login_url="/login/")
494+
@login_required()
496495
def post_update_view(request, post_id):
497496
post = get_object_or_404(Post, pk=post_id)
498497

@@ -516,7 +515,7 @@ def post_update_view(request, post_id):
516515
return render(request, "punkweb_bb/partials/post_update.html", context=context)
517516

518517

519-
@login_required(login_url="/login/")
518+
@login_required()
520519
def post_delete_view(request, post_id):
521520
post = get_object_or_404(Post, pk=post_id)
522521

@@ -572,7 +571,7 @@ def shout_create_view(request):
572571
)
573572

574573

575-
@login_required(login_url="/login/")
574+
@login_required()
576575
def shout_delete_view(request, shout_id):
577576
shout = get_object_or_404(Shout, pk=shout_id)
578577

0 commit comments

Comments
 (0)