Merge remote-tracking branch 'origin/master'

Author: ultmaster

account/models.py

@@ -41,9 +41,9 @@ class User(AbstractUser):
         'unique': "This email has already been used."
     })
     privilege = models.CharField(choices=PRIVILEGE_CHOICE, max_length=12, default=Privilege.REGULAR_USER)
-    school = models.CharField('school', max_length=192, blank=True)
+    school = models.CharField('school', max_length=64, blank=True)
     create_time = models.DateTimeField(auto_now_add=True)
-    nickname = models.CharField('nickname', max_length=192, blank=True)
+    nickname = models.CharField('nickname', max_length=30, blank=True)
     magic = models.CharField('magic', choices=MAGIC_CHOICE, max_length=18, blank=True)
     show_tags = models.BooleanField('show tags', default=True)
     preferred_lang = models.CharField('preferred language', choices=LANG_CHOICE, max_length=12, default='cpp')
@@ -55,9 +55,9 @@ class User(AbstractUser):
                                   format='JPEG',
                                   options={'quality': 60})
     avatar_large = ImageSpecField(source='avatar',
-                                processors=[ResizeToFill(500, 500)],
-                                format='JPEG',
-                                options={'quality': 60})
+                                  processors=[ResizeToFill(500, 500)],
+                                  format='JPEG',
+                                  options={'quality': 60})
 
     def __str__(self):
         return self.username

backstage/account/views.py

@@ -32,9 +32,9 @@ def get_context_data(self, **kwargs):
         data['admin'] = self.request.GET.get('admin')
         return data
 
-class AccountPrivilegeSwitch(BaseBackstageMixin, View):
 
-    def get(self, request, pk):
+class AccountPrivilegeSwitch(BaseBackstageMixin, View):
+    def post(self, request, pk):
         with transaction.atomic():
             user = User.objects.select_for_update().get(pk=pk)
             if self.request.user.privilege == Privilege.ROOT:

backstage/contest/views.py

@@ -4,10 +4,10 @@
 import random
 
 from django.shortcuts import render, HttpResponseRedirect, HttpResponse, reverse
-from django.views import static
+from django.views import static, View
+from django.views.generic import TemplateView
 from django.contrib import messages
 from django.views.generic.list import ListView
-from django.views import View
 from django.utils import timezone
 from django.db import IntegrityError, transaction
 
@@ -26,11 +26,10 @@ def get_formatted_time():
     return timezone.now().strftime("%Y-%m-%d 00:00")
 
 
-class ContestManage(BaseBackstageMixin, View):
+class ContestManage(BaseBackstageMixin, TemplateView):
     template_name = 'backstage/contest/contest_manage.jinja2'
 
-    @staticmethod
-    def get_context_data(**kwargs):
+    def get_context_data(self, **kwargs):
         contest = Contest.objects.get(**kwargs)
         contest_problem_list = ContestProblem.objects.filter(contest=contest).all()
         profile = [('Title', contest.title), ('Description', contest.description),
@@ -44,9 +43,6 @@ def get_context_data(**kwargs):
                     invitation_count=contest.contestinvitation_set.count(),
                     participant_count=contest.contestparticipant_set.count())
 
-    def get(self, request, **kwargs):
-        return render(request, self.template_name, self.get_context_data(**kwargs))
-
 
 class ContestCreate(BaseCreateView):
     initial = {'start_time': get_formatted_time(), 'end_time': get_formatted_time()}
@@ -112,7 +108,7 @@ def post(self, request, contest_pk):
 
 
 class ContestProblemDelete(BaseBackstageMixin, View):
-    def get(self, request, contest_pk, contest_problem_pk):
+    def post(self, request, contest_pk, contest_problem_pk):
         contest = Contest.objects.get(pk=contest_pk)
         contest.contestproblem_set.get(pk=contest_problem_pk).delete()
         update_contest(contest)
@@ -158,7 +154,7 @@ def post(self, request, pk):
 
 
 class ContestInvitationDelete(BaseBackstageMixin, View):
-    def get(self, request, pk, invitation_pk):
+    def post(self, request, pk, invitation_pk):
         contest = Contest.objects.get(pk=pk)
         contest.contestinvitation_set.get(pk=invitation_pk).delete()
         return HttpResponseRedirect(reverse('backstage:contest_invitation', kwargs={'pk': pk}))
@@ -204,7 +200,7 @@ def post(self, request, pk, participant_pk):
 
 
 class ContestParticipantStarToggle(BaseBackstageMixin, View):
-    def get(self, request, pk, participant_pk):
+    def post(self, request, pk, participant_pk):
         with transaction.atomic():
             participant = Contest.objects.get(pk=pk).contestparticipant_set.select_for_update().get(pk=participant_pk)
             participant.star = True if not participant.star else False

backstage/problem/views.py

@@ -86,7 +86,7 @@ def get(self, request, pk):
 
 
 class FileDelete(BaseBackstageMixin, View):
-    def get(self, request, pk, path):
+    def post(self, request, pk, path):
         import os
         file_path = os.path.join(UPLOAD_DIR, str(pk), path)
         try:
@@ -169,7 +169,6 @@ class ProblemList(BaseBackstageMixin, ListView):
 
 
 class ProblemRejudge(BaseBackstageMixin, View):
-
     def post(self, request):
         try:
             problem = request.POST['problem']
@@ -183,8 +182,7 @@ def post(self, request):
 
 
 class ProblemVisibleSwitch(BaseBackstageMixin, View):
-
-    def get(self, request, pk):
+    def post(self, request, pk):
         with transaction.atomic():
             problem = Problem.objects.select_for_update().get(pk=pk)
             problem.visible = True if not problem.visible else False

backstage/server/views.py

@@ -35,15 +35,15 @@ class ServerList(BaseBackstageMixin, ListView):
 
 
 class ServerRefresh(BaseBackstageMixin, View):
-    def get(self, request, pk):
+    def post(self, request, pk):
         server = Server.objects.get(pk=pk)
         server.serverproblemstatus_set.all().delete()
         messages.success(request, "Server status has been refreshed.")
         return HttpResponseRedirect(reverse('backstage:server'))
 
 
 class ServerDelete(BaseBackstageMixin, View):
-    def get(self, request, pk):
+    def post(self, request, pk):
         server = Server.objects.get(pk=pk)
         server.delete()
         messages.success(request, "Server <strong>%s</strong> is successfully removed." % server.name)

eoj3/local_settings.example.py

@@ -16,7 +16,7 @@
 EMAIL_HOST = ""
 EMAIL_HOST_USER = ""
 EMAIL_HOST_PASSWORD = ""
-DEFAULT_FROM_EMAIL = ""
+SERVER_EMAIL = DEFAULT_FROM_EMAIL = ""
 EMAIL_PORT = 25
 EMAIL_USE_TLS = True
 ADMINS = [('ultmaster', 'scottyugochang@hotmail.com'), ('zerol', 'zerolfx0@gmail.com')]