Accept Merge Request #115 修复 css 文件夹的问题 : (dev-sxw -> dev)

Merge Request: 修复 css 文件夹的问题
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/115
This commit is contained in:
virusdefender 2015-08-22 20:57:38 +08:00
commit eace9df241
3 changed files with 25 additions and 7 deletions

View File

@ -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;
}

View File

@ -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;

View File

@ -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",