Merge branch 'virusdefender-dev' into debug

* virusdefender-dev:
  更新用户提交 ac 标志存储方法

account/serializers.py

@@ -46,3 +46,9 @@ class EditUserSerializer(serializers.Serializer):
     password = serializers.CharField(max_length=30, min_length=6, required=False, default=None)
     email = serializers.EmailField(max_length=254)
     admin_type = serializers.IntegerField(default=0)
+
+
+class ApplyResetPasswordSerializer(serializers.Serializer):
+    username = serializers.CharField(max_length=30)
+    email = serializers.EmailField()
+    captcha = serializers.CharField(max_length=4, min_length=4)

utils/models.py

@@ -14,14 +14,4 @@ class RichTextField(models.TextField):
         parser = XssHtml()
         parser.feed(value)
         parser.close()
-        return parser.getHtml()
+        return parser.getHtml()
-
-
-class JsonField(models.TextField):
-    __metaclass__ = models.SubfieldBase
-
-    def get_prep_value(self, value):
-        return json.dumps(value)
-
-    def to_python(self, value):
-        return json.loads(value)

utils/templatetags/problem.py

@@ -9,6 +9,9 @@ def get_problem_accepted_radio(problem):
 
 
 def get_problem_status(problems_status, problem_id):
+    # 用户没登陆 或者 user.problem_status 中没有这个字段都会到导致这里的problem_status 为 ""
+    if not problems_status:
+        return ""
 
     if str(problem_id) in problems_status:
         if problems_status[str(problem_id)] == 1:
@@ -16,6 +19,7 @@ def get_problem_status(problems_status, problem_id):
         return "glyphicon glyphicon-minus dealing-flag"
     return ""
 
+
 from django import template
 
 register = template.Library()