From 53e82136e46483184dd441ffe75a4451e34bc274 Mon Sep 17 00:00:00 2001 From: esp Date: Mon, 24 Aug 2015 18:08:32 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=89=8D=E7=AB=AF]=E6=95=B4=E7=90=86js?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F.=20=20=E4=BF=AE=E5=A4=8D=E5=B0=8Fbugs,?= =?UTF-8?q?=E5=85=B3=E4=BA=8E=E6=AF=94=E8=B5=9B=E5=AF=86=E7=A0=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=8F=98=E9=87=8F=E5=90=8D=E7=A7=B0=E7=9A=84=E9=94=99?= =?UTF-8?q?=E8=AF=AF,=E5=B0=8F=E7=BB=84=E4=BF=AE=E6=94=B9=E5=8F=98?= =?UTF-8?q?=E9=87=8F=E5=90=8D=E7=A7=B0=E9=94=99=E8=AF=AF(=E4=BB=A5?= =?UTF-8?q?=E4=B8=8A=E9=83=BD=E6=98=AF=E5=9C=A8=E4=BF=AE=E6=94=B9=E6=AF=94?= =?UTF-8?q?=E8=B5=9B=E9=A1=B5=E9=9D=A2=E5=86=85)[CI=20SKIP]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/js/app/admin/contest/add_contest.js | 46 +++++++++---------- .../src/js/app/admin/contest/contest_list.js | 12 ++--- template/admin/contest/add_contest.html | 2 +- template/admin/contest/contest_list.html | 2 +- 4 files changed, 31 insertions(+), 31 deletions(-) diff --git a/static/src/js/app/admin/contest/add_contest.js b/static/src/js/app/admin/contest/add_contest.js index d62ddad3..3b0073b2 100644 --- a/static/src/js/app/admin/contest/add_contest.js +++ b/static/src/js/app/admin/contest/add_contest.js @@ -66,7 +66,7 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "date bsAlert(data.data); console.log(data); } - } + } }); console.log(JSON.stringify(ajaxData)); } @@ -92,28 +92,28 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "date choseGroupList: [], passwordUsable: false, addGroup: function() { - if (vm.group == -1) return; - if (vm.groupList[vm.group].id == 0){ - vm.passwordUsable = true; - vm.choseGroupList = []; - for (var key in vm.groupList){ - vm.groupList[key].chose = true; - } - } - vm.groupList[vm.group]. chose = true; - vm.choseGroupList.push({name:vm.groupList[vm.group].name, index:vm.group, id:vm.groupList[vm.group].id}); - vm.group = -1; - }, - removeGroup: function(groupIndex){ - if (vm.groupList[vm.choseGroupList[groupIndex].index].id == 0){ - vm.passwordUsable = false; - for (key in vm.groupList){ - vm.groupList[key].chose = false; - } - } - vm.groupList[vm.choseGroupList[groupIndex].index].chose = false; - vm.choseGroupList.remove(vm.choseGroupList[groupIndex]); - } + if (vm.group == -1) return; + if (vm.groupList[vm.group].id == 0){ + vm.passwordUsable = true; + vm.choseGroupList = []; + for (var key in vm.groupList){ + vm.groupList[key].chose = true; + } + } + vm.groupList[vm.group]. chose = true; + vm.choseGroupList.push({name:vm.groupList[vm.group].name, index:vm.group, id:vm.groupList[vm.group].id}); + vm.group = -1; + }, + removeGroup: function(groupIndex){ + if (vm.groupList[vm.choseGroupList[groupIndex].index].id == 0){ + vm.passwordUsable = false; + for (key in vm.groupList){ + vm.groupList[key].chose = false; + } + } + vm.groupList[vm.choseGroupList[groupIndex].index].chose = false; + vm.choseGroupList.remove(vm.choseGroupList[groupIndex]); + } }); $.ajax({ // Get current user type diff --git a/static/src/js/app/admin/contest/contest_list.js b/static/src/js/app/admin/contest/contest_list.js index 6e0467f6..30f8678b 100644 --- a/static/src/js/app/admin/contest/contest_list.js +++ b/static/src/js/app/admin/contest/contest_list.js @@ -22,8 +22,8 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker", return false; } if (vm.choseGroupList[0].id == 0) { //everyone | public contest - if (vm.password) { - ajaxData.password = vm.password; + if (vm.editPassword) { + ajaxData.password = vm.editPassword; ajaxData.contest_type = 2; } else{ @@ -59,8 +59,8 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker", }); console.log(JSON.stringify(ajaxData)); } - return false; - }); + return false; + }); if(avalon.vmodels.contestList){ // this page has been loaded before, so set the default value @@ -152,8 +152,8 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker", if (vm.contestList[contestId-1].contest_type == 0) { //contest type == 0, contest in group //Clear the choseGroupList var stack = [], sp; - for (sp = 0; i < vm.editChoseGroupList.length; sp++){ - stack.push(vm.editChoseGroupList[i].index); + for (sp = 0; sp < vm.choseGroupList.length; sp++){ + stack. push(vm.choseGroupList[sp].index); } while (sp--){ vm.removeGroup(stack[sp]); diff --git a/template/admin/contest/add_contest.html b/template/admin/contest/add_contest.html index 1433e273..a1042e8c 100644 --- a/template/admin/contest/add_contest.html +++ b/template/admin/contest/add_contest.html @@ -44,7 +44,7 @@
- diff --git a/template/admin/contest/contest_list.html b/template/admin/contest/contest_list.html index 77a71c6e..09f9ffcc 100644 --- a/template/admin/contest/contest_list.html +++ b/template/admin/contest/contest_list.html @@ -87,7 +87,7 @@
-