QingdaoU/OnlineJudge
1
0
Fork 0
mirror of https://github.com/QingdaoU/OnlineJudge.git synced 2024-09-21 08:23:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Accept Merge Request #286 修复冲突 : (virusdefender-dev -> dev)

Browse Source 
Merge Request: 修复冲突
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/286
This commit is contained in:
virusdefender 2015-10-30 15:17:43 +08:00
commit 3e336ac540
3 changed files with 43 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
problem/views.py
View File

@ -136,8 +136,8 @@ class ProblemAdminAPIView(APIView):
# 普通管理员只能获取自己创建的题目
# 超级管理员可以获取全部的题目
problem = Problem.objects.get(id=problem_id)
if request.user.admin_type != SUPER_ADMIN:
problem = problem.get(created_by=request.user)
if request.user.admin_type != SUPER_ADMIN and problem.created_by != request.user:
return error_response(u"题目不存在")
return success_response(ProblemSerializer(problem).data)
except Problem.DoesNotExist:
return error_response(u"题目不存在")

27
static/src/js/app/admin/contest/editContest.js
View File

@ -84,7 +84,7 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "date
placeholder: "比赛介绍内容"
}
});
avalon.scan();
$.ajax({
url: "/api/user/",
method: "get",
@ -111,19 +111,9 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "date
vm.allGroups = [];
for (var i = 0; i < data.data.length; i++) {
var item = data.data[i];
item["isSelected"] = false;
item.isSelected = false;
vm.allGroups.push(item);
}
}
else {
bsAlert(data.data);
}
}
});
}
});
$.ajax({
url: "/api/admin/contest/?contest_id=" + avalon.vmodels.admin.contestId,
method: "get",
@ -146,12 +136,10 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "date
vm.allGroups[i].isSelected = false;
}
for (var i = 0; i < contest.groups.length; i++) {
var id = parseInt(contest.groups[i]);
console.log(id);
var id = contest.groups[i];
for (var index = 0; vm.allGroups[index]; index++) {
if (vm.allGroups[index].id == id) {
vm.allGroups[index].isSelected = true;
console.log(id+"asdf");
break;
}
}
@ -163,7 +151,14 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "date
}
}
});
avalon.scan();
}
else {
bsAlert(data.data);
}
}
});
}
});
$("#contest_start_time").datetimepicker({
format: "yyyy-mm-dd hh:ii",

2
template/src/oj_base.html
View File

@ -59,7 +59,7 @@
{{ request.user.username }}
<span class="caret"></span></a>
<ul class="dropdown-menu">
{% if request.user.admin_type == 2 %}
{% if request.user.admin_type > 0 %}
<li><a href="/admin/">后台管理</a></li>
{% endif %}
<li><a href="/submissions/">我的提交</a></li>