From e7aac0a6e03295d1ffa039b556ebaa460555fdfc Mon Sep 17 00:00:00 2001
From: esp <sxwxs@msn.com>
Date: Thu, 27 Aug 2015 14:03:48 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=89=8D=E7=AB=AF]=E4=BF=AE=E5=A4=8D=E4=BA=86?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=AF=94=E8=B5=9B,=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=85=AC=E5=91=8A=E7=9A=84=E5=90=8E=E5=8F=B0=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=AF=B9=E8=B6=85=E7=BA=A7=E7=AE=A1=E7=90=86=E5=91=98=E4=B9=9F?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=9D=83=E9=99=90=E4=B8=8D=E8=B6=B3=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98[CI=20SKIP]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/app/admin/announcement/announcement.js | 46 ++++++++++---------
 static/src/js/app/admin/contest/addContest.js |  1 -
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/static/src/js/app/admin/announcement/announcement.js b/static/src/js/app/admin/announcement/announcement.js
index e558585..9b6f2d2 100644
--- a/static/src/js/app/admin/announcement/announcement.js
+++ b/static/src/js/app/admin/announcement/announcement.js
@@ -130,39 +130,41 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "validator"],
 
             getPageData(1);
 
-            $.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["isSelected"] = false;
-                            vm.allGroups.push(item);
-                        }
-                    }
-                    else {
-                        bsAlert(data.data);
-                    }
-                }
-            });
-
             $.ajax({
                 url: "/api/user/",
                 method: "get",
                 dataType: "json",
                 success: function (data) {
                     if (!data.code) {
+                        var admin_type = data.data.admin_type;
                         if (data.data.admin_type == 1) {
                             vm.isGlobal = false;
                             vm.showGlobalViewRadio = false;
+
                         }
                     }
+                    $.ajax({
+                        url: "/api/admin/group/",
+                        method: "get",
+                        dataType: "json",
+                        success: function (data) {
+                            if (!data.code) {
+                                if (!data.data.length) {
+                                    if (admin_type != 2)
+                                    bsAlert("您的用户权限只能创建组内公告，但是您还没有创建过小组");
+                                    return;
+                                }
+                                for (var i = 0; i < data.data.length; i++) {
+                                    var item = data.data[i];
+                                    item["isSelected"] = false;
+                                    vm.allGroups.push(item);
+                                }
+                            }
+                            else {
+                                bsAlert(data.data);
+                            }
+                        }
+                    });
                 }
             });
 
diff --git a/static/src/js/app/admin/contest/addContest.js b/static/src/js/app/admin/contest/addContest.js
index 437fbdf..d4beadb 100644
--- a/static/src/js/app/admin/contest/addContest.js
+++ b/static/src/js/app/admin/contest/addContest.js
@@ -131,7 +131,6 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "date
                         success: function (data) {
                             if (!data.code) {
                                 if (!data.data.length) {
-                                    bsAlert("您的用户权限只能创建组内比赛，但是您还没有创建过小组");
                                     return;
                                 }
                                 for (var i = 0; i < data.data.length; i++) {