diff --git a/website/challenge_signals.py b/website/challenge_signals.py index 1c564e882..e2374e0e9 100644 --- a/website/challenge_signals.py +++ b/website/challenge_signals.py @@ -5,9 +5,7 @@ from .models import Challenge, IpReport, Issue, Points, TimeLog, UserProfile -def update_challenge_progress( - user, challenge_title, model_class, reason, threshold=None, team_threshold=None -): +def update_challenge_progress(user, challenge_title, model_class, reason, threshold=None, team_threshold=None): if not user.is_authenticated: return try: diff --git a/website/migrations/0173_challenge.py b/website/migrations/0173_challenge.py index 3241a983e..9d960d612 100644 --- a/website/migrations/0173_challenge.py +++ b/website/migrations/0173_challenge.py @@ -49,9 +49,7 @@ class Migration(migrations.Migration): ), ( "team_participants", - models.ManyToManyField( - blank=True, related_name="team_challenges", to="website.organization" - ), + models.ManyToManyField(blank=True, related_name="team_challenges", to="website.organization"), ), ], ), diff --git a/website/migrations/0177_alter_challenge_team_participants.py b/website/migrations/0177_alter_challenge_team_participants.py index 7b3b87a1c..b06da6438 100644 --- a/website/migrations/0177_alter_challenge_team_participants.py +++ b/website/migrations/0177_alter_challenge_team_participants.py @@ -12,8 +12,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name="challenge", name="team_participants", - field=models.ManyToManyField( - blank=True, related_name="team_challenges", to="website.organization" - ), + field=models.ManyToManyField(blank=True, related_name="team_challenges", to="website.organization"), ), ] diff --git a/website/migrations/0180_merge_0178_merge_20241229_1948_0179_contributorstats.py b/website/migrations/0180_merge_0178_merge_20241229_1948_0179_contributorstats.py index 76f1bac25..30025a497 100644 --- a/website/migrations/0180_merge_0178_merge_20241229_1948_0179_contributorstats.py +++ b/website/migrations/0180_merge_0178_merge_20241229_1948_0179_contributorstats.py @@ -4,7 +4,6 @@ class Migration(migrations.Migration): - dependencies = [ ("website", "0178_merge_20241229_1948"), ("website", "0179_contributorstats"), diff --git a/website/migrations/0184_merge_0183_merge_20250124_0618_0183_slackbotactivity.py b/website/migrations/0184_merge_0183_merge_20250124_0618_0183_slackbotactivity.py new file mode 100644 index 000000000..2fb3be0e6 --- /dev/null +++ b/website/migrations/0184_merge_0183_merge_20250124_0618_0183_slackbotactivity.py @@ -0,0 +1,12 @@ +# Generated by Django 5.1.4 on 2025-01-26 10:10 + +from django.db import migrations + + +class Migration(migrations.Migration): + dependencies = [ + ("website", "0183_merge_20250124_0618"), + ("website", "0183_slackbotactivity"), + ] + + operations = [] diff --git a/website/views/company.py b/website/views/company.py index bf459ef88..a26639ccd 100644 --- a/website/views/company.py +++ b/website/views/company.py @@ -1626,4 +1626,4 @@ def delete_manager(request, manager_id, domain_id): except Domain.DoesNotExist: return JsonResponse({"success": False, "message": "Domain not found."}) except User.DoesNotExist: - return JsonResponse({"success": False, "message": "User not found."}) \ No newline at end of file + return JsonResponse({"success": False, "message": "User not found."}) diff --git a/website/views/core.py b/website/views/core.py index c0a1373af..e3ea453a1 100644 --- a/website/views/core.py +++ b/website/views/core.py @@ -923,4 +923,4 @@ def handler404(request, exception): def handler500(request, exception=None): - return render(request, "500.html", {}, status=500) \ No newline at end of file + return render(request, "500.html", {}, status=500) diff --git a/website/views/issue.py b/website/views/issue.py index a9bef8c1e..132ea7df6 100644 --- a/website/views/issue.py +++ b/website/views/issue.py @@ -1581,4 +1581,4 @@ def flag_issue(request, issue_pk): def select_bid(request): - return render(request, "bid_selection.html") \ No newline at end of file + return render(request, "bid_selection.html") diff --git a/website/views/slackbot.py b/website/views/slackbot.py index 0add3508a..ea52dc124 100644 --- a/website/views/slackbot.py +++ b/website/views/slackbot.py @@ -391,4 +391,4 @@ def slack_commands(request): if request.content_type != "application/x-www-form-urlencoded": return JsonResponse({"error": "Invalid content type"}, status=415) return HttpResponse(handler.handle(request)) - return JsonResponse({"error": "Method not allowed"}, status=405) \ No newline at end of file + return JsonResponse({"error": "Method not allowed"}, status=405) diff --git a/website/views/user.py b/website/views/user.py index 6b67503e5..d894e785f 100644 --- a/website/views/user.py +++ b/website/views/user.py @@ -1003,9 +1003,7 @@ class UserChallengeListView(View): def get(self, request): challenges = Challenge.objects.filter(challenge_type="single") # All single-user challenges - user_challenges = challenges.filter( - participants=request.user - ) # Challenges the user is participating in + user_challenges = challenges.filter(participants=request.user) # Challenges the user is participating in for challenge in challenges: if challenge in user_challenges: