Skip to content

Revert "add editor theme" #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 16, 2020
Merged

Revert "add editor theme" #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions account/migrations/0008_user_editor_theme.py
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions account/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ class User(AbstractUser):

list_column = models.IntegerField(default=50)

editor_theme = models.IntegerField(default=0)

first_name = models.NOT_PROVIDED # delete unused feild
last_name = models.NOT_PROVIDED # delete unused feild

Expand Down
11 changes: 1 addition & 10 deletions account/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ class Meta:
"id",
"username",
"lang",
"editor_theme",
"solved",
"submit_time",
"email",
Expand All @@ -24,15 +23,7 @@ class Meta:
"email_verified",
"list_column"
]
read_only_fields = [
"id",
"solved",
"submit_time",
"date_joined",
"last_login",
"email",
"email_verified"
]
read_only_fields = ["id", "solved", "submit_time", "date_joined", "last_login", "email", "email_verified"]

class AccountIntroductionSerializer(serializers.ModelSerializer):
class Meta:
Expand Down
18 changes: 2 additions & 16 deletions account/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ def testB_get_user(self):
"is_staff": True,
"is_active": True,
"is_superuser": True,
"list_column": 50,
"editor_theme": 0
}

request = self.factory.get(self.base_url)
Expand All @@ -67,8 +65,6 @@ def testB_get_user(self):
self.assertEqual(res_data.get("is_staff"), user_data["is_staff"])
self.assertEqual(res_data.get("is_active"), user_data["is_active"])
self.assertEqual(res_data.get("is_superuser"), user_data["is_superuser"])
self.assertEqual(res_data.get("list_column"), user_data["list_column"])
self.assertEqual(res_data.get("editor_theme"), user_data["editor_theme"])

def testC_get_404_user(self):
request = self.factory.get(self.base_url)
Expand Down Expand Up @@ -114,9 +110,7 @@ def testG_get_user_miss_uid(self):

def testH_change_user_admin(self):
request_data = {
"username": "testusernewname",
"is_superuser": True,
"is_staff": True
"username": "testusernewname"
}

request = self.factory.patch(self.base_url, data=request_data, format="json")
Expand All @@ -126,15 +120,10 @@ def testH_change_user_admin(self):

target = User.objects.get(id=2)
self.assertEqual(target.username, request_data["username"])
self.assertEqual(target.is_superuser, request_data["is_superuser"])
self.assertEqual(target.is_staff, request_data["is_staff"])

def testI_change_user_own(self):
request_data = {
"username": "zhangtianlinewname",
"lang": 5,
"list_column": 100,
"editor_theme": 2
"username": "zhangtianlinewname"
}

request = self.factory.patch(self.base_url, data=request_data, format="json")
Expand All @@ -144,9 +133,6 @@ def testI_change_user_own(self):

target = User.objects.get(id=3)
self.assertEqual(target.username, request_data["username"])
self.assertEqual(target.lang, request_data["lang"])
self.assertEqual(target.list_column, request_data["list_column"])
self.assertEqual(target.editor_theme, request_data["editor_theme"])

def testJ_change_user_admin(self):
request_data = {
Expand Down