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

Accept Merge Request #334 修复带密码的小组不能验证密码的错误 : (dev-group -> dev)

Browse Source 
Merge Request: 修复带密码的小组不能验证密码的错误
Created By: @esp
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/334
This commit is contained in:
virusdefender
2015-12-13 14:59:51 +08:00
parent fbbc3558b9 a9d3a5f108
commit 0e222a6109
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contest/views.py
View File

@@ -308,7 +308,7 @@ class ContestPasswordVerifyAPIView(APIView):
if serializer.is_valid(): if serializer.is_valid():
data = request.data data = request.data
try: 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: except Contest.DoesNotExist:
return error_response(u"比赛不存在") return error_response(u"比赛不存在")

2
group/views.py
View File

@@ -22,7 +22,7 @@ class GroupAPIViewBase(object):
def get_group(self, request, group_id): def get_group(self, request, group_id):
""" """
根据group_id查询指定的小组的信息，结合判断用户权限 根据group_id查询指定的小组的信息，结合判断用户权限
管理员可以查询所有的小组，其他用户查询自己创建的自傲组 管理员可以查询所有的小组，其他用户查询自己创建的小组
""" """
if request.user.admin_type == SUPER_ADMIN: if request.user.admin_type == SUPER_ADMIN:
group = Group.objects.get(id=group_id) group = Group.objects.get(id=group_id)

4
static/src/js/app/oj/account/resetPassword.js
View File

@@ -2,8 +2,8 @@ require(["jquery", "bsAlert", "csrfToken", "validator"], function ($, bsAlert, c
var applied_captcha = false; var applied_captcha = false;
$('form').validator().on('submit', function (e) { $('form').validator().on('submit', function (e) {
if (!e.isDefaultPrevented()) { if (!e.isDefaultPrevented()) {
var loca = location.href.split("/"); var splited_location = location.href.split("/");
var token = loca[loca.length-2]; var token = splited_location[splited_location.length-2];
var captcha = $("#captcha").val(); var captcha = $("#captcha").val();
var password = $("#new_password").val(); var password = $("#new_password").val();
$.ajax({ $.ajax({