xuyue/OnlineJudge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename some method and add some decorator

Browse Source
This commit is contained in:
virusdefender
2017-02-10 11:41:01 +08:00
parent 802f27a516
commit 817e5aadae
12 changed files with 58 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
utils/api/api.py
View File

@@ -90,7 +90,6 @@ class APIView(View):
return self._serializer_error_to_str({_k: _v})
def invalid_serializer(self, serializer):
print(serializer.errors)
k, v = self._serializer_error_to_str(serializer.errors)
if k != "non_field_errors":
return self.error(err="invalid-" + k, msg=k + ": " + v)

12
utils/api/tests.py
View File

@@ -2,14 +2,14 @@ from django.core.urlresolvers import reverse
from django.test.testcases import TestCase
from rest_framework.test import APIClient
from account.models import AdminType, User, UserProfile
from account.models import AdminType, ProblemPermission, User, UserProfile
class APITestCase(TestCase):
client_class = APIClient
def create_user(self, username, password, admin_type=AdminType.REGULAR_USER, login=True):
user = User.objects.create(username=username, admin_type=admin_type)
def create_user(self, username, password, admin_type=AdminType.REGULAR_USER, login=True, problem_permission=ProblemPermission.NONE):
user = User.objects.create(username=username, admin_type=admin_type, problem_permission=problem_permission)
user.set_password(password)
UserProfile.objects.create(user=user, time_zone="Asia/Shanghai")
user.save()
@@ -18,10 +18,12 @@ class APITestCase(TestCase):
return user
def create_admin(self, username="admin", password="admin", login=True):
return self.create_user(username=username, password=password, admin_type=AdminType.ADMIN, login=login)
return self.create_user(username=username, password=password, admin_type=AdminType.ADMIN, problem_permission=ProblemPermission.OWN,
login=login)
def create_super_admin(self, username="root", password="root", login=True):
return self.create_user(username=username, password=password, admin_type=AdminType.SUPER_ADMIN, login=login)
return self.create_user(username=username, password=password, admin_type=AdminType.SUPER_ADMIN,
problem_permission=ProblemPermission.ALL, login=login)
def reverse(self, url_name):
return reverse(url_name)

5
utils/management/commands/initadmin.py
View File

@@ -1,6 +1,6 @@
from django.core.management.base import BaseCommand
from account.models import AdminType, User, UserProfile
from account.models import AdminType, ProblemPermission, User, UserProfile
from utils.shortcuts import rand_str # NOQA
@@ -26,7 +26,8 @@ class Command(BaseCommand):
else:
self.stdout.write(self.style.ERROR("User 'root' is not super admin."))
except User.DoesNotExist:
user = User.objects.create(username="root", email="root@oj.com", admin_type=AdminType.SUPER_ADMIN)
user = User.objects.create(username="root", email="root@oj.com", admin_type=AdminType.SUPER_ADMIN,
problem_permission=ProblemPermission.ALL)
# for dev
# rand_password = rand_str(length=6)
rand_password = "rootroot"