diff --git a/contest/views.py b/contest/views.py index 83aa1d0..eccd451 100644 --- a/contest/views.py +++ b/contest/views.py @@ -90,8 +90,8 @@ class ContestAdminAPIView(APIView): try: # 超级管理员可以编辑所有的 contest = Contest.objects.get(id=data["id"]) - if request.user.admin_type != SUPER_ADMIN: - contest = contest.get(created_by=request.user) + if request.user.admin_type != SUPER_ADMIN and contest.created_by != request.user: + return error_response(u"无权访问！") except Contest.DoesNotExist: return error_response(u"该比赛不存在！") try: @@ -144,6 +144,18 @@ class ContestAdminAPIView(APIView): --- response_serializer: ContestSerializer """ + contest_id = request.GET.get("contest_id", None) + if contest_id: + try: + # 普通管理员只能获取自己创建的题目 + # 超级管理员可以获取全部的题目 + contest = Contest.objects.get(id=contest_id) + if request.user.admin_type != SUPER_ADMIN and contest.created_by != request.user: + return error_response(u"题目不存在") + return success_response(ContestSerializer(contest).data) + except Contest.DoesNotExist: + return error_response(u"题目不存在") + if request.user.admin_type == SUPER_ADMIN: contest = Contest.objects.all().order_by("-create_time") else: @@ -171,8 +183,8 @@ class ContestProblemAdminAPIView(APIView): data = serializer.data try: contest = Contest.objects.get(id=data["contest_id"]) - if request.user.admin_type != SUPER_ADMIN: - contest = contest.get(created_by=request.user) + if request.user.admin_type != SUPER_ADMIN and contest.created_by != request.user: + return error_response(u"比赛不存在") except Contest.DoesNotExist: return error_response(u"比赛不存在") contest_problem = ContestProblem.objects.create(title=data["title"], @@ -236,8 +248,8 @@ class ContestProblemAdminAPIView(APIView): if contest_problem_id: try: contest_problem = ContestProblem.objects.get(id=contest_problem_id) - if request.user.admin_type != SUPER_ADMIN: - contest_problem = contest_problem.get(created_by=request.user) + if request.user.admin_type != SUPER_ADMIN and contest_problem.created_by != request.user: + return error_response(u"比赛题目不存在") return success_response(ContestProblemSerializer(contest_problem).data) except ContestProblem.DoesNotExist: return error_response(u"比赛题目不存在") diff --git a/judge/judger/client.py b/judge/judger/client.py index 38dbfc9..f5b1296 100644 --- a/judge/judger/client.py +++ b/judge/judger/client.py @@ -190,4 +190,4 @@ class JudgeClient(object): # http://stackoverflow.com/questions/25382455/python-notimplementederror-pool-objects-cannot-be-passed-between-processes self_dict = self.__dict__.copy() del self_dict['_pool'] - return self_dict \ No newline at end of file + return self_dict diff --git a/judge/judger_controller/celery.py b/judge/judger_controller/celery.py index 18cf886..4c64ab0 100644 --- a/judge/judger_controller/celery.py +++ b/judge/judger_controller/celery.py @@ -1,7 +1,9 @@ # coding=utf-8 from __future__ import absolute_import -from celery import Celery +from celery import Celery, platforms from .settings import redis_config app = Celery("judge", broker='redis://%s:%s/%s' % (redis_config["host"], redis_config["port"], redis_config["db"]), - include=["judge.judger_controller.tasks"]) \ No newline at end of file + include=["judge.judger_controller.tasks"]) + +platforms.C_FORCE_ROOT =True diff --git a/judge/judger_controller/settings.py b/judge/judger_controller/settings.py index 4c155b5..4d48340 100644 --- a/judge/judger_controller/settings.py +++ b/judge/judger_controller/settings.py @@ -36,4 +36,4 @@ submission_db = { "db": "oj_submission", "user": "root", "password": "root" -} \ No newline at end of file +} diff --git a/runJudge.sh b/runJudge.sh new file mode 100755 index 0000000..ba25da8 --- /dev/null +++ b/runJudge.sh @@ -0,0 +1 @@ +nohup celery -A judge.judger_controller worker -l DEBUG & diff --git a/static/src/js/app/admin/contest/addContest.js b/static/src/js/app/admin/contest/addContest.js index b05ba4e..9cbd57d 100644 --- a/static/src/js/app/admin/contest/addContest.js +++ b/static/src/js/app/admin/contest/addContest.js @@ -104,6 +104,7 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "date bsAlert("您的用户权限只能创建小组内比赛，但是您还没有创建过小组"); return; } + vm.allGroups = []; for (var i = 0; i < data.data.length; i++) { var item = data.data[i]; item["isSelected"] = false; diff --git a/static/src/js/app/admin/contest/contestList.js b/static/src/js/app/admin/contest/contestList.js index 515933d..885cdea 100644 --- a/static/src/js/app/admin/contest/contestList.js +++ b/static/src/js/app/admin/contest/contestList.js @@ -24,7 +24,7 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker", editContest: function(contestId){ avalon.vmodels.admin.contestId = contestId; - // todo 修改template_url + avalon.vmodels.admin.template_url = "template/contest/edit_contest.html"; }, showContestProblems: function(contestId){ avalon.vmodels.admin.contestId = contestId; @@ -51,7 +51,6 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker", success: function (data) { if (!data.code) { vm.contestList = data.data.results; - vm.announcementList = data.data.results; avalon.vmodels.contestListPager.totalPage = data.data.total_page; } else { diff --git a/static/src/js/app/admin/contest/editContest.js b/static/src/js/app/admin/contest/editContest.js new file mode 100644 index 0000000..bce5b9a --- /dev/null +++ b/static/src/js/app/admin/contest/editContest.js @@ -0,0 +1,180 @@ +require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "datetimePicker", + "validator", "editorComponent"], + function ($, avalon, editor, uploader, bsAlert, csrfTokenHeader) { + + $("#edit-contest-form").validator().on('submit', function (e) { + if (!e.isDefaultPrevented()) { + e.preventDefault(); + var ajaxData = { + id: avalon.vmodels.admin.contestId, + title: vm.title, + description: avalon.vmodels.contestDescriptionEditor.content, + contest_type: 0, + real_time_rank: vm.realTimeRank, + start_time: vm.startTime, + end_time: vm.endTime, + visible: vm.visible + }; + + var selectedGroups = []; + if (!vm.isGlobal) { + for (var i = 0; i < vm.allGroups.length; i++) { + if (vm.allGroups[i].isSelected) { + selectedGroups.push(vm.allGroups[i].id); + } + } + ajaxData.groups = selectedGroups; + } + else { + if (vm.password) { + ajaxData.password = vm.password; + ajaxData.contest_type = 2; + } + else + ajaxData.contest_type = 1; + } + if (!vm.isGlobal && !selectedGroups.length) { + bsAlert("你没有选择参赛用户!"); + return false; + } + if (ajaxData.description.trim() == "") { + bsAlert("比赛描述不能为空!"); + return false; + } + $.ajax({ + url: "/api/admin/contest/", + dataType: "json", + contentType: "application/json;charset=UTF-8", + data: JSON.stringify(ajaxData), + method: "put", + success: function (data) { + if (!data.code) { + bsAlert("修改成功！"); + vm.showContestListPage(); + } + else { + bsAlert(data.data); + } + } + }); + } + return false; + }); + + if (avalon.vmodels.edit_contest) + var vm = avalon.vmodels.edit_contest; + else + var vm = avalon.define({ + $id: "edit_contest", + title: "", + startTime: "", + endTime: "", + password: "", + isGlobal: true, + allGroups: [], + showGlobalViewRadio: true, + realTimeRank: true, + visible: false, + showContestListPage: function() { + avalon.vmodels.admin.template_url = "template/contest/contest_list.html"; + }, + + contestDescriptionEditor: { + editorId: "contest-description-editor", + placeholder: "比赛介绍内容" + } + }); + + $.ajax({ + url: "/api/user/", + method: "get", + dataType: "json", + success: function (data) { + if (!data.code) { + var admin_type = data.data.admin_type; + if (data.data.admin_type == 1) { + vm.isGlobal = false; + vm.showGlobalViewRadio = false; + } + } + $.ajax({ + url: "/api/admin/group/", + method: "get", + dataType: "json", + success: function (data) { + if (!data.code) { + if (!data.data.length) { + if (admin_type != 2) + bsAlert("您的用户权限只能创建小组内比赛，但是您还没有创建过小组"); + return; + } + vm.allGroups = []; + for (var i = 0; i < data.data.length; i++) { + var item = data.data[i]; + item["isSelected"] = false; + vm.allGroups.push(item); + } + } + else { + bsAlert(data.data); + } + } + }); + } + }); + + + $.ajax({ + url: "/api/admin/contest/?contest_id=" + avalon.vmodels.admin.contestId, + method: "get", + dataType: "json", + success: function (data) { + if (data.code) { + bsAlert(data.data); + } + else { + var contest = data.data; + vm.title = contest.title; + avalon.vmodels.contestDescriptionEditor.content = contest.description; + vm.visible = contest.visible; + vm.realTimeRank = contest.real_time_rank; + vm.startTime = contest.start_time.substring(0, 16).replace("T", " "); + vm.endTime = contest.end_time.substring(0, 16).replace("T", " "); + if (contest.contest_type == 0) { //contest_type == 0, 小组内比赛 + vm.isGlobal = false; + for (var i = 0; i < vm.allGroups.length; i++) { + vm.allGroups[i].isSelected = false; + } + for (var i = 0; i < contest.groups.length; i++) { + var id = parseInt(contest.groups[i]); + console.log(id); + for (var index = 0; vm.allGroups[index]; index++) { + if (vm.allGroups[index].id == id) { + vm.allGroups[index].isSelected = true; + console.log(id+"asdf"); + break; + } + } + } + } + else { + vm.isGlobal = true; + } + } + } + }); + avalon.scan(); + + $("#contest_start_time").datetimepicker({ + format: "yyyy-mm-dd hh:ii", + minuteStep: 5, + weekStart: 1, + language: "zh-CN" + }); + $("#contest_end_time").datetimepicker({ + format: "yyyy-mm-dd hh:ii", + minuteStep: 5, + weekStart: 1, + language: "zh-CN" + }); + }); \ No newline at end of file diff --git a/template/src/admin/contest/edit_contest.html b/template/src/admin/contest/edit_contest.html new file mode 100644 index 0000000..2afc849 --- /dev/null +++ b/template/src/admin/contest/edit_contest.html @@ -0,0 +1,107 @@ +
+
+ +
+ +
+
+
+ + +
+
+
+
+ +
+
+
+ +
+
+
+ + +
+ + +
+
+
+
+ + +
+ + +
+
+
+
+
+ + +
+ + + + + + +
+ +
+
+
+ + +
+ +
+
+
+ +
+   {{ el.name }} +
+
+ +
+ + +
+ +
+
+
+ + +
+ +
+
+
+ +
+
+
+ +