From 839d86bcb9139b2a8d2be7ed47c0dd85b9242798 Mon Sep 17 00:00:00 2001
From: esp <sxwxs@msn.com>
Date: Sat, 22 Aug 2015 20:19:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8A=8A=E5=8D=95=E7=8B=AC=E7=9A=84css?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=B7=BB=E5=8A=A0=E5=88=B0=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=A4=B9contest=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/src/css/add_contest.css | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 static/src/css/add_contest.css

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

From fe043007faea4cd1d327d6b568010a7b23e161b1 Mon Sep 17 00:00:00 2001
From: esp <sxwxs@msn.com>
Date: Sat, 22 Aug 2015 20:20:00 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8A=8A=E5=8D=95=E7=8B=AC=E7=9A=84css?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=B7=BB=E5=8A=A0=E5=88=B0=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=A4=B9contest=E4=B8=AD[CI=20SKIP]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/src/css/admin.css                      |  2 +-
 .../src/js/app/admin/contest/contest_list.js  | 25 ++++++++++++++++++-
 2 files changed, 25 insertions(+), 2 deletions(-)

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