From 6153aa4002113cf189612f825bd3613a248fdcf7 Mon Sep 17 00:00:00 2001
From: hohoTT <609029365@qq.com>
Date: Wed, 12 Aug 2015 18:11:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B0=8F=E7=BB=84=E4=BF=A1=E6=81=AF=E9=83=A8?=
 =?UTF-8?q?=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 group/migrations/0004_merge.py                | 15 ++++
 static/src/js/app/admin/group/group_detail.js | 73 ++++++++++++++-----
 template/admin/group/group_detail.html        | 15 ++--
 template/admin/user/user_list.html            |  2 +-
 4 files changed, 75 insertions(+), 30 deletions(-)
 create mode 100644 group/migrations/0004_merge.py

diff --git a/group/migrations/0004_merge.py b/group/migrations/0004_merge.py
new file mode 100644
index 0000000..febb5e2
--- /dev/null
+++ b/group/migrations/0004_merge.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('group', '0003_auto_20150811_1906'),
+        ('group', '0002_auto_20150811_1649'),
+    ]
+
+    operations = [
+    ]
diff --git a/static/src/js/app/admin/group/group_detail.js b/static/src/js/app/admin/group/group_detail.js
index 0c6561e..e946ba2 100644
--- a/static/src/js/app/admin/group/group_detail.js
+++ b/static/src/js/app/admin/group/group_detail.js
@@ -13,28 +13,8 @@ require(["jquery", "avalon", "csrf", "bs_alert", "validation"], function ($, ava
             page_count: 1,
             name: "",
             description: "",
-            join_group_setting: {0: false, 1: false, 2: false},
             checked_setting: "0",
 
-            updateGroupInfo: function () {
-                $.ajax({
-                    beforeSend: csrfHeader,
-                    url: "/api/admin/group/",
-                    method: "put",
-                    data: {group_id: avalon.vmodels.admin.group_id, name: vm.name,
-                        description: vm.description, join_group_setting: vm.checked_setting},
-                    dataType: "json",
-                    success: function (data) {
-                        if (!data.code) {
-                            bs_alert("修改成功");
-                        }
-                        else {
-                            bs_alert(data.data);
-                        }
-                    }
-                })
-            },
-
             getNext: function () {
                 if (!vm.next_page)
                     return;
@@ -110,6 +90,59 @@ require(["jquery", "avalon", "csrf", "bs_alert", "validation"], function ($, ava
                 }
             }
         })
+
+        $("#edit_group_form")
+                .formValidation({
+                    framework: "bootstrap",
+                    fields: {
+                        name: {
+                            validators: {
+                                notEmpty: {
+                                    message: "请填写小组名"
+                                },
+                                stringLength: {
+                                    max: 20,
+                                    message: '小组名长度必须在20位之内'
+                                }
+                            }
+                        },
+                        description: {
+                            validators: {
+                                notEmpty: {
+                                    message: "请填写描述"
+                                },
+                                stringLength: {
+                                    max: 300,
+                                    message: '描述长度必须在300位之内'
+                                }
+                            }
+                        }
+                    }
+                }
+            ).on('success.form.fv', function (e) {
+                e.preventDefault();
+                var data = {
+                    group_id: avalon.vmodels.admin.group_id,
+                    name: vm.name,
+                    description: vm.description,
+                    join_group_setting: vm.checked_setting
+                };
+                $.ajax({
+                    beforeSend: csrfHeader,
+                    url: "/api/admin/group/",
+                    method: "put",
+                    data: data,
+                    dataType: "json",
+                    success: function (data) {
+                        if (!data.code) {
+                            bs_alert("修改成功");
+                        }
+                        else {
+                            bs_alert(data.data);
+                        }
+                    }
+                })
+            });
     });
 
 });
\ No newline at end of file
diff --git a/template/admin/group/group_detail.html b/template/admin/group/group_detail.html
index dc695e0..7c4559f 100644
--- a/template/admin/group/group_detail.html
+++ b/template/admin/group/group_detail.html
@@ -25,11 +25,9 @@
         <button ms-attr-class="getBtnClass(0)" ms-click="getPrevious">上一页</button>
         <button ms-attr-class="getBtnClass(1)" ms-click="getNext">下一页</button>
     </div>
-
     <h1>修改小组信息</h1>
 
-    <div>
-
+    <form id="edit_group_form">
         <div class="col-md-12">
             <div class="form-group"><label>小组名</label>
                 <input type="text" name="name" class="form-control" ms-duplex="name">
@@ -37,22 +35,21 @@
         </div>
         <div class="col-md-12">
             <div class="form-group"><label>描述</label>
-                <textarea rows="3" class="form-control" ms-duplex="description"></textarea>
+                <textarea rows="3" name="description" class="form-control" ms-duplex="description"></textarea>
             </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="checked_setting">允许任何人加入
                 <input type="radio" name="join_group_setting" value="1" ms-duplex-string="checked_setting">提交请求后管理员审核
                 <input type="radio" name="join_group_setting" value="2" ms-duplex-string="checked_setting">不允许任何人加入
+
             </div>
-        </div>
-        <div class="col-md-12">
-            <button class="btn btn-primary" ms-click="updateGroupInfo()">提交</button>
+            <button class="btn btn-primary" type="submit">提交</button>
         </div>
 
-    </div>
-
+    </form>
 </div>
 <script src="/static/js/app/admin/group/group_detail.js"></script>
\ No newline at end of file
diff --git a/template/admin/user/user_list.html b/template/admin/user/user_list.html
index 14d020d..a281cd3 100644
--- a/template/admin/user/user_list.html
+++ b/template/admin/user/user_list.html
@@ -71,7 +71,7 @@
                 </div>
             </div>
             <div class="form-group">
-                <button type="sbumit" class="btn btn-primary">提交</button>
+                <button type="submit" class="btn btn-primary">提交</button>
             </div>
         </form>
     </div>