From 876af8d2330a835dd76dec86b4bfb062b0795ad6 Mon Sep 17 00:00:00 2001 From: esp Date: Tue, 25 Aug 2015 09:27:46 +0800 Subject: [PATCH 1/9] =?UTF-8?q?[=E5=89=8D=E7=AB=AF]=E4=BF=AE=E5=A4=8DuserL?= =?UTF-8?q?ist=E9=A1=B5=E9=9D=A2avalon=E9=87=8D=E5=AE=9A=E4=B9=89=E9=97=AE?= =?UTF-8?q?=E9=A2=98[CI=20SKIP]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/src/js/app/admin/user/userList.js | 112 ++++++++++++----------- 1 file changed, 61 insertions(+), 51 deletions(-) diff --git a/static/src/js/app/admin/user/userList.js b/static/src/js/app/admin/user/userList.js index 0842dc5..3a525b8 100644 --- a/static/src/js/app/admin/user/userList.js +++ b/static/src/js/app/admin/user/userList.js @@ -3,58 +3,68 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "validator"], function ($, // avalon:定义模式 userList avalon.ready(function () { - avalon.vmodels.userList = null; - var vm = avalon.define({ - $id: "userList", - //通用变量 - userList: [], - previousPage: 0, - nextPage: 0, - page: 1, - editingUserId: 0, - totalPage: 1, - userType: ["一般用户", "管理员", "超级管理员"], - keyword: "", - showAdminOnly: false, - //编辑区域同步变量 - username: "", - realName: "", - email: "", - adminType: 0, - id: 0, - getNext: function () { - if (!vm.nextPage) - return; - getPageData(vm.page + 1); - }, - getPrevious: function () { - if (!vm.previousPage) - return; - getPageData(vm.page - 1); - }, - getBtnClass: function (btn) { //上一页/下一页按钮启用禁用逻辑 - if (btn) { - return vm.nextPage ? "btn btn-primary" : "btn btn-primary disabled"; + //avalon.vmodels.userList = null; + if (avalon.vmodels.userList) { + var vm = avalon.vmodels.userList; + // initialize avalon object + userList= [], previousPage= 0, nextPage= 0, page= 1, + editingUserId= 0, totalPage: 1, keyword: "", showAdminOnly: false, + //user editor fields + username: "", realName: "", email: "", adminType: 0, id: 0, + } + else { + var vm = avalon.define({ + $id: "userList", + //通用变量 + userList: [], + previousPage: 0, + nextPage: 0, + page: 1, + editingUserId: 0, + totalPage: 1, + userType: ["一般用户", "管理员", "超级管理员"], + keyword: "", + showAdminOnly: false, + //编辑区域同步变量 + username: "", + realName: "", + email: "", + adminType: 0, + id: 0, + getNext: function () { + if (!vm.nextPage) + return; + getPageData(vm.page + 1); + }, + getPrevious: function () { + if (!vm.previousPage) + return; + getPageData(vm.page - 1); + }, + getBtnClass: function (btn) { //上一页/下一页按钮启用禁用逻辑 + if (btn) { + return vm.nextPage ? "btn btn-primary" : "btn btn-primary disabled"; + } + else { + return vm.previousPage ? "btn btn-primary" : "btn btn-primary disabled"; + } + }, + editUser: function (user) { //点击编辑按钮的事件,显示/隐藏编辑区 + vm.username = user.username; + vm.realName = user.real_name; + vm.adminType = user.admin_type; + vm.email = user.email; + vm.id = user.id; + if (vm.editingUserId == user.id) + vm.editingUserId = 0; + else + vm.editingUserId = user.id; + }, + search: function () { + getPageData(1); } - else { - return vm.previousPage ? "btn btn-primary" : "btn btn-primary disabled"; - } - }, - editUser: function (user) { //点击编辑按钮的事件,显示/隐藏编辑区 - vm.username = user.username; - vm.realName = user.real_name; - vm.adminType = user.admin_type; - vm.email = user.email; - vm.id = user.id; - if (vm.editingUserId == user.id) - vm.editingUserId = 0; - else - vm.editingUserId = user.id; - }, - search: function () { - getPageData(1); - } - }); + }); + } vm.$watch("showAdminOnly", function () { getPageData(1); }); From 6767f2b54b0ca1274769774c81716e297c4134a9 Mon Sep 17 00:00:00 2001 From: esp Date: Tue, 25 Aug 2015 10:09:21 +0800 Subject: [PATCH 2/9] =?UTF-8?q?[=E5=89=8D=E7=AB=AF]=E4=BF=AE=E5=A4=8DuserL?= =?UTF-8?q?ist.js=E4=B8=AD=E5=85=B3=E4=BA=8E=E7=BF=BB=E9=A1=B5=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E7=8A=B6=E6=80=81=E6=8E=A7=E5=88=B6=E5=87=BD=E6=95=B0?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E7=9A=84=E9=94=99=E8=AF=AF.=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=88=9A=E5=88=9A=E6=8F=90=E4=BA=A4=E7=9A=84bug[CI=20?= =?UTF-8?q?SKIP]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/src/js/app/admin/user/userList.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/static/src/js/app/admin/user/userList.js b/static/src/js/app/admin/user/userList.js index 3a525b8..3f80c89 100644 --- a/static/src/js/app/admin/user/userList.js +++ b/static/src/js/app/admin/user/userList.js @@ -7,10 +7,10 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "validator"], function ($, if (avalon.vmodels.userList) { var vm = avalon.vmodels.userList; // initialize avalon object - userList= [], previousPage= 0, nextPage= 0, page= 1, - editingUserId= 0, totalPage: 1, keyword: "", showAdminOnly: false, + userList = []; previousPage= 0; nextPage= 0; page = 1; + editingUserId= 0; totalPage = 1; keyword= ""; showAdminOnly= false; //user editor fields - username: "", realName: "", email: "", adminType: 0, id: 0, + username= ""; realName= ""; email= ""; adminType= 0; id= 0; } else { var vm = avalon.define({ @@ -42,7 +42,7 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "validator"], function ($, getPageData(vm.page - 1); }, getBtnClass: function (btn) { //上一页/下一页按钮启用禁用逻辑 - if (btn) { + if (btn == "next") { return vm.nextPage ? "btn btn-primary" : "btn btn-primary disabled"; } else { From d490d89dcd5cfcea63ecbad04c6293aa24df33f8 Mon Sep 17 00:00:00 2001 From: esp Date: Tue, 25 Aug 2015 10:20:58 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dtypo=20in=20submission/vi?= =?UTF-8?q?ews.py=20=20=20Swagger=20UI=20docs=E4=B8=AD=E7=9A=84=E6=8B=BC?= =?UTF-8?q?=E5=86=99=E9=94=99=E8=AF=AF[CI=20SKIP]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- submission/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submission/views.py b/submission/views.py index 6399e22..d9a6377 100644 --- a/submission/views.py +++ b/submission/views.py @@ -164,7 +164,7 @@ class ContestSubmissionAPIView(APIView): """ 创建比赛的提交 --- - request_serializer: ConestSubmissionSerializer + request_serializer: CreateContestSubmissionSerializer """ serializer = CreateContestSubmissionSerializer(data=request.data) if serializer.is_valid(): From ae64944449a8acf5e14fa16480afdf61d0d27f88 Mon Sep 17 00:00:00 2001 From: esp Date: Tue, 25 Aug 2015 10:47:53 +0800 Subject: [PATCH 4/9] =?UTF-8?q?[BUG-fix]=E8=BF=94=E5=9B=9E=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E6=8F=90=E7=A4=BA=E7=A1=AE=E8=AE=A4,=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E4=B8=8D=E8=83=BD=E5=BC=B9=E5=87=BA=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98[CI=20SKIP]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/admin/contest/edit_problem.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/admin/contest/edit_problem.html b/template/admin/contest/edit_problem.html index 6402f04..4307036 100644 --- a/template/admin/contest/edit_problem.html +++ b/template/admin/contest/edit_problem.html @@ -2,7 +2,7 @@
From 0ab2583dc8195af1585619e92e6a7f2e36bc6b70 Mon Sep 17 00:00:00 2001 From: esp Date: Tue, 25 Aug 2015 10:55:43 +0800 Subject: [PATCH 5/9] =?UTF-8?q?[=E5=89=8D=E7=AB=AF]=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=AF=94=E8=B5=9B=E9=A2=98=E7=9B=AE=E5=88=97=E8=A1=A8=E5=8F=AF?= =?UTF-8?q?=E8=A7=81=E5=AD=97=E6=AE=B5=E7=9A=84=E6=98=BE=E7=A4=BA,?= =?UTF-8?q?=E6=96=B9=E4=BE=BF=E6=AF=94=E8=B5=9B=E7=AE=A1=E7=90=86[CI=20SKI?= =?UTF-8?q?P]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/admin/contest/contest_list.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/template/admin/contest/contest_list.html b/template/admin/contest/contest_list.html index 09f9ffc..4c6adab 100644 --- a/template/admin/contest/contest_list.html +++ b/template/admin/contest/contest_list.html @@ -161,6 +161,7 @@ 编号 题目 分值 + 可见 创建时间 @@ -168,6 +169,7 @@ {{ el.sort_index }} {{ el.title }} {{ el.score}} + {{ getYesOrNo(el.visible) }} {{ el.create_time|date("yyyy-MM-dd HH:mm:ss") }} Date: Tue, 25 Aug 2015 10:58:14 +0800 Subject: [PATCH 6/9] =?UTF-8?q?[=E5=89=8D=E7=AB=AF-BUG]=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=AF=94=E8=B5=9B=E7=BC=96=E8=BE=91=E5=8C=BA=E5=8F=AF=E8=A7=81?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF,(?= =?UTF-8?q?=E5=BF=98=E8=AE=B0=E5=8A=A0vm.),=E5=A2=9E=E5=8A=A0=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E6=88=90=E5=8A=9F=E9=9A=90=E8=97=8F=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=A1=86=E7=9A=84=E8=A1=8C=E4=B8=BA,=E6=9B=B4=E5=8A=A0?= =?UTF-8?q?=E6=96=B9=E4=BE=BF[CI=20SKIP]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/src/js/app/admin/contest/contest_list.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/static/src/js/app/admin/contest/contest_list.js b/static/src/js/app/admin/contest/contest_list.js index 30f8678..f978f76 100644 --- a/static/src/js/app/admin/contest/contest_list.js +++ b/static/src/js/app/admin/contest/contest_list.js @@ -21,6 +21,10 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker", bsAlert("你没有选择参赛用户!"); return false; } + if (vm.editDescription == "") { + bsAlert("比赛描述不能为空!"); + return false; + } if (vm.choseGroupList[0].id == 0) { //everyone | public contest if (vm.editPassword) { ajaxData.password = vm.editPassword; @@ -48,8 +52,8 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker", success: function (data) { if (!data.code) { bsAlert("修改成功!"); - console.log(data); - vm.getPage(1); + vm.editingContestId = 0; // Hide the editor + vm.getPage(1); // Refresh the contest list } else { bsAlert(data.data); @@ -148,7 +152,7 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker", vm.editStartTime = vm.contestList[contestId-1].start_time.substring(0,16).replace("T"," "); vm.editEndTime = vm.contestList[contestId-1].end_time.substring(0,16).replace("T"," "); vm.editMode = vm.contestList[contestId-1].mode; - editVisible = vm.contestList[contestId-1].visible; + vm.editVisible = vm.contestList[contestId-1].visible; if (vm.contestList[contestId-1].contest_type == 0) { //contest type == 0, contest in group //Clear the choseGroupList var stack = [], sp; From f1802b0ced6595ede6b682cd0738eec787587b5f Mon Sep 17 00:00:00 2001 From: esp Date: Tue, 25 Aug 2015 12:03:06 +0800 Subject: [PATCH 7/9] =?UTF-8?q?[=E5=89=8D=E7=AB=AF]=E4=BF=AE=E5=A4=8Dbug,?= =?UTF-8?q?=E6=9B=B4=E6=AD=A3=E4=BA=86=E4=B8=8D=E6=81=B0=E5=BD=93=E7=9A=84?= =?UTF-8?q?foreach=E5=BE=AA=E7=8E=AF,(js=E9=87=8Cfor(var=20key=20in=20arra?= =?UTF-8?q?y)=E4=B8=8D=E4=BB=85=E9=81=8D=E5=8E=86=E4=BA=86=E6=95=B0?= =?UTF-8?q?=E7=BB=84=E5=85=83=E7=B4=A0,=E8=BF=98=E5=B0=86=E9=81=8D?= =?UTF-8?q?=E5=8E=86=E6=95=B0=E7=BB=84=E5=85=B6=E4=BB=96=E7=9A=84=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E4=BB=A5=E5=8F=8A=E6=88=90=E5=91=98=E6=96=B9=E6=B3=95?= =?UTF-8?q?),=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=98=BE=E7=A4=BA=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E5=8C=BA=E5=87=BD=E6=95=B0=E5=AF=B9=E9=80=89=E4=B8=AD?= =?UTF-8?q?=E5=B0=8F=E7=BB=84=E9=94=99=E8=AF=AF=E7=9A=84=E6=B8=85=E9=99=A4?= =?UTF-8?q?=E6=96=B9=E6=B3=95.(=E5=8E=9F=E6=9D=A5=E7=9A=84=E5=81=9A?= =?UTF-8?q?=E6=B3=95=E5=B0=86=E5=AF=BC=E8=87=B4=E6=9F=90=E4=BA=9B=E6=83=85?= =?UTF-8?q?=E5=86=B5=E4=B8=8B=E6=97=A7=E7=9A=84=E5=B0=8F=E7=BB=84=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E7=A7=BB=E9=99=A4=E7=BC=96=E8=BE=91=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?.=20=20=E5=A2=9E=E6=B7=BB=E4=BA=86=E5=88=87=E6=8D=A2=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E6=AF=94=E8=B5=9B=E7=9A=84=E6=8F=90=E7=A4=BA,?= =?UTF-8?q?=E9=98=B2=E6=AD=A2=E7=94=A8=E6=88=B7=E4=B8=A2=E5=A4=B1=E4=B8=BA?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E7=9A=84=E4=BF=A1=E6=81=AF.=20=20=20=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=97=AE=E9=A2=98=E5=88=97=E8=A1=A8=E5=AF=B9?= =?UTF-8?q?=E5=8F=AF=E8=A7=81=E6=AF=94=E8=B5=9B=E7=9A=84=E7=AD=9B=E9=80=89?= =?UTF-8?q?[CI=20SKIP]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/js/app/admin/contest/contest_list.js | 28 +++++++++++-------- template/admin/contest/contest_list.html | 3 ++ 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/static/src/js/app/admin/contest/contest_list.js b/static/src/js/app/admin/contest/contest_list.js index f978f76..b9dbd3d 100644 --- a/static/src/js/app/admin/contest/contest_list.js +++ b/static/src/js/app/admin/contest/contest_list.js @@ -94,7 +94,7 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker", vm.editChoseGroupList= []; vm.editingProblemContestIndex= 0; } - else + else { var vm = avalon.define({ $id: "contestList", contestList: [], @@ -102,6 +102,7 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker", nextPage: 0, page: 1, totalPage: 1, + showVisibleOnly: false, group: "-1", groupList: [], choseGroupList: [], @@ -143,6 +144,8 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker", getPageData(page_index); }, showEditContestArea: function (contestId) { + if (vm.editingContestId && !confirm("如果继续将丢失未保存的信息,是否继续?")) + return; if (contestId == vm.editingContestId) vm.editingContestId = 0; else { @@ -155,12 +158,8 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker", vm.editVisible = vm.contestList[contestId-1].visible; if (vm.contestList[contestId-1].contest_type == 0) { //contest type == 0, contest in group //Clear the choseGroupList - var stack = [], sp; - for (sp = 0; sp < vm.choseGroupList.length; sp++){ - stack. push(vm.choseGroupList[sp].index); - } - while (sp--){ - vm.removeGroup(stack[sp]); + while (vm.choseGroupList.length) { + vm.removeGroup(0); } for (var i = 0; i < vm.contestList[contestId-1].groups.length; i++){ @@ -219,8 +218,8 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker", if (vm.groupList[vm.group].id == 0){ vm.passwordUsable = true; vm.choseGroupList = []; - for (var key in vm.groupList){ - vm.groupList[key].chose = true; + for (var i = 0; i < vm.groupList.length; i++) { + vm.groupList[i].chose = true; } } vm.groupList[vm.group]. chose = true; @@ -229,10 +228,11 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker", vm.group = -1; }, removeGroup: function(groupIndex){ + console.log(groupIndex); if (vm.groupList[vm.choseGroupList[groupIndex].index].id == 0){ vm.passwordUsable = false; - for (key in vm.groupList){ - vm.groupList[key].chose = false; + for (var i = 0; i < vm.groupList.length; i++) { + vm.groupList[i].chose = false; } } vm.groupList[vm.choseGroupList[groupIndex].index].chose = false; @@ -250,6 +250,10 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker", return "否"; } }); + vm.$watch("showVisibleOnly", function() { + getPageData(1); + }) + } getPageData(1); //init time picker @@ -268,6 +272,8 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker", function getPageData(page) { var url = "/api/admin/contest/?paging=true&page=" + page + "&page_size=10"; + if (vm.showVisibleOnly) + url += "&visible=true" if (vm.keyword != "") url += "&keyword=" + vm.keyword; $.ajax({ diff --git a/template/admin/contest/contest_list.html b/template/admin/contest/contest_list.html index 4c6adab..8163ad3 100644 --- a/template/admin/contest/contest_list.html +++ b/template/admin/contest/contest_list.html @@ -34,6 +34,9 @@ +
+ +
页数：{{ page }}/{{ totalPage }}   From 4881637c791667556af09da626d104574f24b268 Mon Sep 17 00:00:00 2001 From: esp Date: Tue, 25 Aug 2015 12:21:31 +0800 Subject: [PATCH 8/9] =?UTF-8?q?[=E5=89=8D=E7=AB=AF]=E7=BB=9F=E4=B8=80admin?= =?UTF-8?q?=E4=B8=ADjs=E5=91=BD=E5=90=8D=E6=96=B9=E5=BC=8F.=20=20=E4=B8=BA?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E6=8C=89=E9=92=AE[CI=20SKIP]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/admin/contest/{add_contest.js => addContest.js} | 0 .../app/admin/contest/{contest_list.js => contestList.js} | 0 .../app/admin/contest/{edit_problem.js => editProblem.js} | 0 .../app/admin/problem/{add_problem.js => addProblem.js} | 0 .../app/admin/problem/{edit_problem.js => editProblem.js} | 0 .../problem/{submission_list.js => submissionList.js} | 6 ++++-- template/admin/contest/add_contest.html | 2 +- template/admin/contest/contest_list.html | 2 +- template/admin/contest/edit_problem.html | 2 +- template/admin/problem/add_problem.html | 2 +- template/admin/problem/edit_problem.html | 2 +- template/admin/problem/submission_list.html | 8 +++++++- 12 files changed, 16 insertions(+), 8 deletions(-) rename static/src/js/app/admin/contest/{add_contest.js => addContest.js} (100%) rename static/src/js/app/admin/contest/{contest_list.js => contestList.js} (100%) rename static/src/js/app/admin/contest/{edit_problem.js => editProblem.js} (100%) rename static/src/js/app/admin/problem/{add_problem.js => addProblem.js} (100%) rename static/src/js/app/admin/problem/{edit_problem.js => editProblem.js} (100%) rename static/src/js/app/admin/problem/{submission_list.js => submissionList.js} (91%) diff --git a/static/src/js/app/admin/contest/add_contest.js b/static/src/js/app/admin/contest/addContest.js similarity index 100% rename from static/src/js/app/admin/contest/add_contest.js rename to static/src/js/app/admin/contest/addContest.js diff --git a/static/src/js/app/admin/contest/contest_list.js b/static/src/js/app/admin/contest/contestList.js similarity index 100% rename from static/src/js/app/admin/contest/contest_list.js rename to static/src/js/app/admin/contest/contestList.js diff --git a/static/src/js/app/admin/contest/edit_problem.js b/static/src/js/app/admin/contest/editProblem.js similarity index 100% rename from static/src/js/app/admin/contest/edit_problem.js rename to static/src/js/app/admin/contest/editProblem.js diff --git a/static/src/js/app/admin/problem/add_problem.js b/static/src/js/app/admin/problem/addProblem.js similarity index 100% rename from static/src/js/app/admin/problem/add_problem.js rename to static/src/js/app/admin/problem/addProblem.js diff --git a/static/src/js/app/admin/problem/edit_problem.js b/static/src/js/app/admin/problem/editProblem.js similarity index 100% rename from static/src/js/app/admin/problem/edit_problem.js rename to static/src/js/app/admin/problem/editProblem.js diff --git a/static/src/js/app/admin/problem/submission_list.js b/static/src/js/app/admin/problem/submissionList.js similarity index 91% rename from static/src/js/app/admin/problem/submission_list.js rename to static/src/js/app/admin/problem/submissionList.js index 21c451b..405cffa 100644 --- a/static/src/js/app/admin/problem/submission_list.js +++ b/static/src/js/app/admin/problem/submissionList.js @@ -1,4 +1,4 @@ -require(["jquery", "avalon", "csrfToken", "bsAlert", "formValidation"], function ($, avalon, csrfTokenHeader, bsAlert) { +require(["jquery", "avalon", "csrfToken", "bsAlert"], function ($, avalon, csrfTokenHeader, bsAlert) { avalon.ready(function () { avalon.vmodels.submissionList = null; @@ -41,9 +41,11 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "formValidation"], function getPage: function (page_index) { getPageData(page_index); }, - showSubmissionDetailPage: function (submissionId) { + }, + showProblemListPage: function(){ + vm.$fire("up!showProblemListPage"); } }); diff --git a/template/admin/contest/add_contest.html b/template/admin/contest/add_contest.html index a1042e8..6f237c5 100644 --- a/template/admin/contest/add_contest.html +++ b/template/admin/contest/add_contest.html @@ -103,4 +103,4 @@
- + diff --git a/template/admin/contest/contest_list.html b/template/admin/contest/contest_list.html index 8163ad3..5c15629 100644 --- a/template/admin/contest/contest_list.html +++ b/template/admin/contest/contest_list.html @@ -185,4 +185,4 @@ - + diff --git a/template/admin/contest/edit_problem.html b/template/admin/contest/edit_problem.html index 4307036..331917c 100644 --- a/template/admin/contest/edit_problem.html +++ b/template/admin/contest/edit_problem.html @@ -135,4 +135,4 @@ - + diff --git a/template/admin/problem/add_problem.html b/template/admin/problem/add_problem.html index fadea4c..38c22c6 100644 --- a/template/admin/problem/add_problem.html +++ b/template/admin/problem/add_problem.html @@ -134,4 +134,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/template/admin/problem/edit_problem.html b/template/admin/problem/edit_problem.html index 3dd0870..0a2b7b5 100644 --- a/template/admin/problem/edit_problem.html +++ b/template/admin/problem/edit_problem.html @@ -140,4 +140,4 @@ - + diff --git a/template/admin/problem/submission_list.html b/template/admin/problem/submission_list.html index 6d94dab..70aacb8 100644 --- a/template/admin/problem/submission_list.html +++ b/template/admin/problem/submission_list.html @@ -1,4 +1,10 @@
+

提交列表

@@ -25,4 +31,4 @@ - \ No newline at end of file + \ No newline at end of file From 1145c4e29c46d572b7326ea816b5da559770e5d7 Mon Sep 17 00:00:00 2001 From: esp Date: Tue, 25 Aug 2015 12:38:37 +0800 Subject: [PATCH 9/9] =?UTF-8?q?[=E5=89=8D=E7=AB=AF]=E6=95=B4=E7=90=86?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F,=E5=8E=BB=E6=8E=89tab(=E4=BB=A5=E5=89=8D?= =?UTF-8?q?=E7=94=A8vim,=E5=AE=83=E8=87=AA=E5=B7=B1=E7=BB=99=E5=8A=A0?= =?UTF-8?q?=E7=9A=84),=E5=8E=BB=E6=8E=89=E8=B0=83=E8=AF=95=E7=94=A8?= =?UTF-8?q?=E7=9A=84console.log[CI=20SKIP]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/src/js/app/admin/contest/addContest.js | 3 -- .../src/js/app/admin/contest/contestList.js | 41 ++++++++----------- .../src/js/app/admin/problem/editProblem.js | 1 - 3 files changed, 18 insertions(+), 27 deletions(-) diff --git a/static/src/js/app/admin/contest/addContest.js b/static/src/js/app/admin/contest/addContest.js index 3b0073b..437fbdf 100644 --- a/static/src/js/app/admin/contest/addContest.js +++ b/static/src/js/app/admin/contest/addContest.js @@ -36,7 +36,6 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "date ajaxData.groups.push(parseInt(vm.choseGroupList[i].id)) } - console.log(ajaxData); $.ajax({ // Add contest beforeSend: csrfTokenHeader, url: "/api/admin/contest/", @@ -64,11 +63,9 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "date } else { bsAlert(data.data); - console.log(data); } } }); - console.log(JSON.stringify(ajaxData)); } return false; }); diff --git a/static/src/js/app/admin/contest/contestList.js b/static/src/js/app/admin/contest/contestList.js index b9dbd3d..9c1ba71 100644 --- a/static/src/js/app/admin/contest/contestList.js +++ b/static/src/js/app/admin/contest/contestList.js @@ -40,29 +40,26 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker", ajaxData.groups.push(parseInt(vm.choseGroupList[i].id)) } - console.log(ajaxData); - $.ajax({ // Add contest - beforeSend: csrfTokenHeader, - url: "/api/admin/contest/", - dataType: "json", - contentType: "application/json", - data: JSON.stringify(ajaxData), - method: "put", - contentType: "application/json", - success: function (data) { - if (!data.code) { - bsAlert("修改成功!"); + $.ajax({ // Add contest + beforeSend: csrfTokenHeader, + url: "/api/admin/contest/", + dataType: "json", + contentType: "application/json", + data: JSON.stringify(ajaxData), + method: "put", + contentType: "application/json", + success: function (data) { + if (!data.code) { + bsAlert("修改成功!"); vm.editingContestId = 0; // Hide the editor vm.getPage(1); // Refresh the contest list - } - else { - bsAlert(data.data); - console.log(data); - } - } - }); - console.log(JSON.stringify(ajaxData)); - } + } + else { + bsAlert(data.data); + } + } + }); + } return false; }); @@ -228,7 +225,6 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker", vm.group = -1; }, removeGroup: function(groupIndex){ - console.log(groupIndex); if (vm.groupList[vm.choseGroupList[groupIndex].index].id == 0){ vm.passwordUsable = false; for (var i = 0; i < vm.groupList.length; i++) { @@ -242,7 +238,6 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker", vm.$fire("up!showContestProblemPage", 0, vm.contestList[vm.editingProblemContestIndex-1].id, vm.editMode); }, showProblemEditor: function(el) { - console.log(el); vm.$fire("up!showContestProblemPage", el.id, vm.contestList[vm.editingProblemContestIndex-1].id, vm.editMode); }, getYesOrNo: function(yORn) { diff --git a/static/src/js/app/admin/problem/editProblem.js b/static/src/js/app/admin/problem/editProblem.js index 8805519..8e1ce6d 100644 --- a/static/src/js/app/admin/problem/editProblem.js +++ b/static/src/js/app/admin/problem/editProblem.js @@ -158,7 +158,6 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "tagE } else { var problem = data.data; - console.log(problem); vm.title = problem.title; vm.description = problem.description; vm.timeLimit = problem.time_limit;