minor update
This commit is contained in:
+17
-4
@@ -6,6 +6,7 @@ from django.db import IntegrityError
|
||||
from django.db.models import Exists, OuterRef
|
||||
from django.http import JsonResponse
|
||||
from django.shortcuts import render, redirect, get_object_or_404
|
||||
from django.utils import timezone
|
||||
from django.views.decorators.http import require_POST
|
||||
from .models import Issue, User, Vote, Comment, Department
|
||||
from .forms import CitizenRegistrationForm, IssueForm, CommentForm
|
||||
@@ -117,7 +118,18 @@ def custom_login(request):
|
||||
username = form.cleaned_data.get('username')
|
||||
password = form.cleaned_data.get('password')
|
||||
user = authenticate(username=username, password=password)
|
||||
|
||||
if user is not None:
|
||||
# 🔹 Auto unban check
|
||||
if hasattr(user, "is_currently_banned") and user.is_currently_banned():
|
||||
days_left = (user.banned_until - timezone.now()).days
|
||||
messages.error(
|
||||
request,
|
||||
f"🚫 Your account is banned for {days_left} more days for reporting a fake issue."
|
||||
)
|
||||
return redirect('login')
|
||||
|
||||
# Normal login
|
||||
login(request, user)
|
||||
messages.success(request, f'Welcome back, {username}!')
|
||||
return redirect('home')
|
||||
@@ -127,6 +139,7 @@ def custom_login(request):
|
||||
messages.error(request, 'Invalid username or password.')
|
||||
else:
|
||||
form = AuthenticationForm()
|
||||
|
||||
return render(request, 'core/login.html', {'form': form})
|
||||
|
||||
@login_required
|
||||
@@ -314,15 +327,15 @@ def unban_user(request, user_id):
|
||||
messages.success(request, f"{citizen.username} has been unbanned.")
|
||||
return redirect('manage_users')
|
||||
|
||||
# core/views.py
|
||||
@login_required
|
||||
@user_passes_test(superadmin_check)
|
||||
def delete_fake_issue(request, issue_id):
|
||||
issue = get_object_or_404(Issue, id=issue_id)
|
||||
reporter = issue.reporter
|
||||
reporter = issue.reporter
|
||||
reporter.ban(7)
|
||||
issue.delete()
|
||||
messages.error(request, f"Issue by {reporter.username} was reported fake and deleted.")
|
||||
return redirect('manage_issues')
|
||||
messages.success(request, f"✅ Issue deleted and user {reporter.username} has been banned for 7 days.")
|
||||
return redirect("manage_issues")
|
||||
|
||||
|
||||
def resolver_check(user):
|
||||
|
||||
Reference in New Issue
Block a user