From c2597a6647eee6401d5e49851881c78396f5bd91 Mon Sep 17 00:00:00 2001
From: sxw <sxwxs@msn.com>
Date: Sat, 5 Dec 2015 13:26:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=90=8E=E5=8F=B0=E5=B0=8F?=
 =?UTF-8?q?=E7=BB=84=E7=AE=A1=E7=90=86=E7=9B=B8=E5=85=B3=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=96=B0=E5=BB=BA=E5=B0=8F=E7=BB=84?=
 =?UTF-8?q?UI=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=88=B0=E5=B0=8F=E7=BB=84?=
 =?UTF-8?q?=E8=AF=A6=E7=BB=86=E7=9A=84=E8=BF=9E=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/src/js/app/admin/admin.js             |  9 +----
 static/src/js/app/admin/group/group.js       | 35 +++++++++++++++++---
 static/src/js/app/admin/group/groupDetail.js |  1 +
 static/src/js/app/oj/group/group.js          |  3 +-
 template/src/admin/group/group.html          | 29 ++++++++++++++++
 template/src/admin/group/group_detail.html   |  4 +--
 6 files changed, 66 insertions(+), 15 deletions(-)

diff --git a/static/src/js/app/admin/admin.js b/static/src/js/app/admin/admin.js
index 72c8fd6..2c527de 100644
--- a/static/src/js/app/admin/admin.js
+++ b/static/src/js/app/admin/admin.js
@@ -103,14 +103,7 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "bootstrap"], function ($,
             }
         });
 
-        vm.$watch("showGroupDetailPage", function (groupId) {
-            vm.groupId = groupId;
-            vm.template_url = "template/group/group_detail.html";
-        });
-
-        vm.$watch("showGroupListPage", function () {
-            vm.template_url = "template/group/group.html";
-        });
+       
 
         avalon.scan();
 
diff --git a/static/src/js/app/admin/group/group.js b/static/src/js/app/admin/group/group.js
index 425e4bb..f97e809 100644
--- a/static/src/js/app/admin/group/group.js
+++ b/static/src/js/app/admin/group/group.js
@@ -1,7 +1,30 @@
-require(["jquery", "avalon", "csrfToken", "bsAlert"], function ($, avalon, csrfTokenHeader, bsAlert) {
+require(["jquery", "avalon", "csrfToken", "bsAlert", "validator"], function ($, avalon, csrfTokenHeader, bsAlert) {
 
     avalon.ready(function () {
-        //avalon.vmodels.group = null;
+        $('#add-group-form').validator().on('submit', function (e) {
+        if (!e.isDefaultPrevented()) {
+            var name = vm.name;
+            var description = vm.description;
+            var join_group_setting = vm.group_type;
+            $.ajax({
+                beforeSend: csrfTokenHeader,
+                url: "/api/admin/group/",
+                method: "post",
+                data: {name: name, description: description, join_group_setting: join_group_setting},
+                dataType: "json",
+                success: function (data) {
+                    if (!data.code) {
+                        getPageData(1);
+                        bsAlert("添加成功");
+                    }
+                    else {
+                        bsAlert(data.data);
+                    }
+                }
+            });
+            return false;
+        }
+        })
         if (avalon.vmodels.group) {
             var vm = avalon.vmodels.group;
         }
@@ -16,7 +39,9 @@ require(["jquery", "avalon", "csrfToken", "bsAlert"], function ($, avalon, csrfT
                 page: 1,                           //    当前页数
                 totalPage: 1,                   //    总页数
                 keyword: "",
-
+                name: "",
+                description: "",
+                group_type: 0,
                 getNext: function () {
                     if (!vm.nextPage)
                         return;
@@ -42,8 +67,10 @@ require(["jquery", "avalon", "csrfToken", "bsAlert"], function ($, avalon, csrfT
                 getGroupSettingString: function (setting) {
                     return {0: "允许任何人加入", 1: "提交请求后管理员审核", 2: "不允许任何人加入"}[setting]
                 },
+  
                 showGroupDetailPage: function (groupId) {
-                    vm.$fire("up!showGroupDetailPage", groupId);
+                    avalon.vmodels.admin.groupId = groupId;
+                    avalon.vmodels.admin.template_url = "template/group/group_detail.html";
                 }
             });
         }
diff --git a/static/src/js/app/admin/group/groupDetail.js b/static/src/js/app/admin/group/groupDetail.js
index de4a0ff..7b7e3f3 100644
--- a/static/src/js/app/admin/group/groupDetail.js
+++ b/static/src/js/app/admin/group/groupDetail.js
@@ -53,6 +53,7 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "validator"], function ($,
                     })
                 },
                 showGroupListPage: function () {
+                    avalon.vmodels.admin.template_url = "template/group/group.html";
                     vm.$fire("up!showGroupListPage");
                 }
             });
diff --git a/static/src/js/app/oj/group/group.js b/static/src/js/app/oj/group/group.js
index d937142..66bb733 100644
--- a/static/src/js/app/oj/group/group.js
+++ b/static/src/js/app/oj/group/group.js
@@ -3,9 +3,10 @@ require(["jquery", "csrfToken", "bsAlert"], function ($, csrfTokenHeader, bsAler
         var message;
         if ($("#applyMessage").length) {
             message = $("#applyMessage").val();
-            if (!message)
+            if (!message) {
                 bsAlert("提交失败,请填写申请信息!");
                 return false;
+            }
         }
 
         var groupId = window.location.pathname.split("/")[2];
diff --git a/template/src/admin/group/group.html b/template/src/admin/group/group.html
index 84614c9..3dcb7ea 100644
--- a/template/src/admin/group/group.html
+++ b/template/src/admin/group/group.html
@@ -38,6 +38,35 @@
         <button ms-attr-class="getBtnClass('pre')" ms-click="getPrevious">上一页</button>
         <button ms-attr-class="getBtnClass('next')" ms-click="getNext">下一页</button>
     </div>
+    <h2>创建小组</h2>
+    <form id="add-group-form">
+        <div class="col-md-12">
+            <div class="form-group"><label>小组名</label>
+                <input type="text" name="name" class="form-control" ms-duplex="name"
+                        data-error="请填写小组名(名称不能超过20字)" maxlength="20" required>
+                <div class="help-block with-errors"></div>
+            </div>
+        </div>
+        <div class="col-md-12">
+            <div class="form-group"><label>描述</label>
+                <textarea rows="3" name="description" class="form-control" ms-duplex="description"
+                          data-error="请填写描述" maxlength="300" required>
+                </textarea>
+                <div class="help-block with-errors"></div>
+            </div>
+        </div>
+        
+        <div class="col-md-12">
+            <div class="form-group">
+                <label>加入小组设置</label>
+                <input type="radio" name="join_group_setting" value="0" ms-duplex-string="group_type">允许任何人加入
+                <input type="radio" name="join_group_setting" value="1" ms-duplex-string="group_type">提交请求后管理员审核
+                <input type="radio" name="join_group_setting" value="2" ms-duplex-string="group_type">不允许任何人加入
+
+            </div>
+            <input type="submit" class="btn btn-success btn-lg" value="创建小组" id="submitBtn">
+        </div>
+    </form>
 
 </div>
 <script src="/static/js/app/admin/group/group.js"></script>
\ No newline at end of file
diff --git a/template/src/admin/group/group_detail.html b/template/src/admin/group/group_detail.html
index b75f0ef..a6e0a3b 100644
--- a/template/src/admin/group/group_detail.html
+++ b/template/src/admin/group/group_detail.html
@@ -5,7 +5,7 @@
                     aria-hidden="true">&larr;</span> 返回</a></li>
         </ul>
     </nav>
-    <h1>小组成员管理</h1>
+    <h2>小组成员管理</h2>
     <table class="table table-striped">
         <tr>
             <th>ID</th>
@@ -31,7 +31,7 @@
         <button ms-attr-class="getBtnClass('pre')" ms-click="getPrevious">上一页</button>
         <button ms-attr-class="getBtnClass('next')" ms-click="getNext">下一页</button>
     </div>
-    <h1>修改小组信息</h1>
+    <h2>修改小组信息</h2>
 
     <form id="edit_group_form">
         <div class="col-md-12">