diff --git a/contest/views.py b/contest/views.py index cfc2049b..d1787028 100644 --- a/contest/views.py +++ b/contest/views.py @@ -308,7 +308,7 @@ class ContestPasswordVerifyAPIView(APIView): if serializer.is_valid(): data = request.data try: - contest = Contest.objects.get(id=data["contest_id"], contest_type=PASSWORD_PROTECTED_CONTEST) + contest = Contest.objects.get(id=data["contest_id"], contest_type__in=[PASSWORD_PROTECTED_CONTEST,PASSWORD_PROTECTED_GROUP_CONTEST]) except Contest.DoesNotExist: return error_response(u"比赛不存在") diff --git a/group/views.py b/group/views.py index 5c2797b1..83b430c3 100644 --- a/group/views.py +++ b/group/views.py @@ -22,7 +22,7 @@ class GroupAPIViewBase(object): def get_group(self, request, group_id): """ 根据group_id查询指定的小组的信息,结合判断用户权限 - 管理员可以查询所有的小组,其他用户查询自己创建的自傲组 + 管理员可以查询所有的小组,其他用户查询自己创建的小组 """ if request.user.admin_type == SUPER_ADMIN: group = Group.objects.get(id=group_id) diff --git a/static/src/js/app/oj/account/changePassword.js b/static/src/js/app/oj/account/changePassword.js index fe7d908a..e825285a 100644 --- a/static/src/js/app/oj/account/changePassword.js +++ b/static/src/js/app/oj/account/changePassword.js @@ -10,7 +10,7 @@ require(["jquery", "bsAlert", "csrfToken", "validator"], function ($, bsAlert, c $('form').validator().on('submit', function (e) { e.preventDefault(); - var newPassword = $("#new_password ").val(); + var newPassword = $("#new_password").val(); var password = $("#password").val(); var captcha = $("#captcha").val(); $.ajax({ diff --git a/static/src/js/app/oj/account/resetPassword.js b/static/src/js/app/oj/account/resetPassword.js index ef1128d0..f4be55a5 100644 --- a/static/src/js/app/oj/account/resetPassword.js +++ b/static/src/js/app/oj/account/resetPassword.js @@ -2,8 +2,8 @@ require(["jquery", "bsAlert", "csrfToken", "validator"], function ($, bsAlert, c var applied_captcha = false; $('form').validator().on('submit', function (e) { if (!e.isDefaultPrevented()) { - var loca = location.href.split("/"); - var token = loca[loca.length-2]; + var splited_location = location.href.split("/"); + var token = splited_location[splited_location.length-2]; var captcha = $("#captcha").val(); var password = $("#new_password").val(); $.ajax({