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

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
commit 0e222a6109
4 changed files with 5 additions and 5 deletions

View File

@ -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"比赛不存在")

View File

@ -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)

View File

@ -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({

View File

@ -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({