diff --git a/static/src/css/add_contest.css b/static/src/css/add_contest.css deleted file mode 100644 index f9a00e67..00000000 --- a/static/src/css/add_contest.css +++ /dev/null @@ -1,5 +0,0 @@ -.group-tag { - padding-left: 5px; color: #46799b; background: #e0eaf1; white-space: nowrap; - overflow: hidden; cursor: pointer; border-radius: 2px 0 0 2px; - float: left; padding: 0 4px;box-sizing: border-box;list-style-type: none; margin: 5px; -} diff --git a/static/src/css/admin.css b/static/src/css/admin.css index 66186309..37ebdfb3 100644 --- a/static/src/css/admin.css +++ b/static/src/css/admin.css @@ -6,7 +6,7 @@ @import url("webuploader/webuploader.css"); @import url("datetime_picker/bootstrap-datetimepicker.css"); @import url("tagEditor/jquery.tag-editor.css"); -@import url("add_contest.css"); +@import url("contest/add_contest.css"); #loading-gif{ width: 40px; diff --git a/static/src/js/app/admin/contest/contest_list.js b/static/src/js/app/admin/contest/contest_list.js index a7378e14..0be9cfb9 100644 --- a/static/src/js/app/admin/contest/contest_list.js +++ b/static/src/js/app/admin/contest/contest_list.js @@ -111,9 +111,32 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker"] } var isSuperAdmin = true; + $.ajax({ //用于获取该用户创建的所有小组的ajax请求 + + url: "/api/admin/group/", + method: "get", + dataType: "json", + success: function (data) { + if (!data.code) { + if (!data.data.length) { + bsAlert("您的用户权限只能创建组内比赛,但是您还没有创建过小组"); + return; + } + for (var i = 0; i < data.data.length; i++) { + var item = data.data[i]; + item["chose"] = false; + vm.groupList.push(item); + } + } + else { + bsAlert(data.data); + } + } + + beforeSend: csrfTokenHeader, - url: "/api/admin/group/?my_group=true", + url: url, dataType: "json", method: "get", contentType: "application/json",