From a0b34a01a438209a374c36745d1175b75e104369 Mon Sep 17 00:00:00 2001
From: virusdefender <1670873886@qq.com>
Date: Tue, 11 Aug 2015 19:48:46 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20html=20=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=20typo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/admin/announcement/announcement.html     | 4 ++--
 template/admin/group/group.html                   | 4 ++--
 template/admin/group/group_detail.html            | 4 ++--
 template/admin/group/join_group_request_list.html | 4 ++--
 template/admin/user/user_list.html                | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/template/admin/announcement/announcement.html b/template/admin/announcement/announcement.html
index e113ff7..583bd45 100644
--- a/template/admin/announcement/announcement.html
+++ b/template/admin/announcement/announcement.html
@@ -27,8 +27,8 @@
     </div>
     <div class="text-right">
         页数：{{page}}/{{page_count}}&nbsp;&nbsp;
-        <botton ms-attr-class="getBtnClass(0)" ms-click="getPrevious">上一页</botton>
-        <botton ms-attr-class="getBtnClass(1)" ms-click="getNext">下一页</botton>
+        <button ms-attr-class="getBtnClass(0)" ms-click="getPrevious">上一页</button>
+        <button ms-attr-class="getBtnClass(1)" ms-click="getNext">下一页</button>
     </div>
 
     <div ms-visible="isEditing">
diff --git a/template/admin/group/group.html b/template/admin/group/group.html
index 81a8e08..bbadea4 100644
--- a/template/admin/group/group.html
+++ b/template/admin/group/group.html
@@ -35,8 +35,8 @@
 
     <div class="text-right">
         页数：{{page}}/{{page_count}}&nbsp;&nbsp;
-        <botton ms-attr-class="getBtnClass(0)" ms-click="getPrevious">上一页</botton>
-        <botton ms-attr-class="getBtnClass(1)" ms-click="getNext">下一页</botton>
+        <button ms-attr-class="getBtnClass(0)" ms-click="getPrevious">上一页</button>
+        <button ms-attr-class="getBtnClass(1)" ms-click="getNext">下一页</button>
     </div>
 
 </div>
diff --git a/template/admin/group/group_detail.html b/template/admin/group/group_detail.html
index d38b4f6..e087838 100644
--- a/template/admin/group/group_detail.html
+++ b/template/admin/group/group_detail.html
@@ -22,8 +22,8 @@
 
     <div class="text-right">
         页数：{{ page }}/{{ page_count }}&nbsp;&nbsp;
-        <botton ms-attr-class="getBtnClass(0)" ms-click="getPrevious">上一页</botton>
-        <botton ms-attr-class="getBtnClass(1)" ms-click="getNext">下一页</botton>
+        <button ms-attr-class="getBtnClass(0)" ms-click="getPrevious">上一页</button>
+        <button ms-attr-class="getBtnClass(1)" ms-click="getNext">下一页</button>
     </div>
 
     <h1>修改小组信息</h1>
diff --git a/template/admin/group/join_group_request_list.html b/template/admin/group/join_group_request_list.html
index 5c74e63..647a022 100644
--- a/template/admin/group/join_group_request_list.html
+++ b/template/admin/group/join_group_request_list.html
@@ -23,8 +23,8 @@
 
     <div class="text-right">
         页数：{{page}}/{{page_count}}&nbsp;&nbsp;
-        <botton ms-attr-class="getBtnClass(0)" ms-click="getPrevious">上一页</botton>
-        <botton ms-attr-class="getBtnClass(1)" ms-click="getNext">下一页</botton>
+        <button ms-attr-class="getBtnClass(0)" ms-click="getPrevious">上一页</button>
+        <button ms-attr-class="getBtnClass(1)" ms-click="getNext">下一页</button>
     </div>
 
 </div>
diff --git a/template/admin/user/user_list.html b/template/admin/user/user_list.html
index 8f87af1..14d020d 100644
--- a/template/admin/user/user_list.html
+++ b/template/admin/user/user_list.html
@@ -39,8 +39,8 @@
     </div>
     <div class="text-right">
         页数：{{page}}/{{page_count}}&nbsp;&nbsp;
-        <botton ms-attr-class="getBtnClass(0)" ms-click="getPrevious">上一页</botton>
-        <botton ms-attr-class="getBtnClass(1)" ms-click="getNext">下一页</botton>
+        <button ms-attr-class="getBtnClass(0)" ms-click="getPrevious">上一页</button>
+        <button ms-attr-class="getBtnClass(1)" ms-click="getNext">下一页</button>
     </div>
     <div ms-visible="isEditing">
         <h3>修改用户信息</h3>

From d93c4559a597ec39d1fcfbb13eeb17e83ef9bd7b Mon Sep 17 00:00:00 2001
From: virusdefender <1670873886@qq.com>
Date: Tue, 11 Aug 2015 20:12:05 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=B0=8F=E7=BB=84=E4=BF=A1=E6=81=AF=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=E7=9A=84=20radio=20=E4=B8=8D=E8=83=BD=E7=BB=91=E5=AE=9A?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/src/js/app/admin/group/group_detail.js | 10 +++-------
 template/admin/group/group_detail.html        |  6 +++---
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/static/src/js/app/admin/group/group_detail.js b/static/src/js/app/admin/group/group_detail.js
index 93a5d43..0c6561e 100644
--- a/static/src/js/app/admin/group/group_detail.js
+++ b/static/src/js/app/admin/group/group_detail.js
@@ -14,11 +14,7 @@ require(["jquery", "avalon", "csrf", "bs_alert", "validation"], function ($, ava
             name: "",
             description: "",
             join_group_setting: {0: false, 1: false, 2: false},
-            checked_setting: 0,
-
-            getSettingChecked: function (setting) {
-                return setting == vm.join_group_setting;
-            },
+            checked_setting: "0",
 
             updateGroupInfo: function () {
                 $.ajax({
@@ -26,7 +22,7 @@ require(["jquery", "avalon", "csrf", "bs_alert", "validation"], function ($, ava
                     url: "/api/admin/group/",
                     method: "put",
                     data: {group_id: avalon.vmodels.admin.group_id, name: vm.name,
-                        description: vm.description, join_group_setting: vm.join_group_setting},
+                        description: vm.description, join_group_setting: vm.checked_setting},
                     dataType: "json",
                     success: function (data) {
                         if (!data.code) {
@@ -107,7 +103,7 @@ require(["jquery", "avalon", "csrf", "bs_alert", "validation"], function ($, ava
                 if (!data.code) {
                     vm.name = data.data.name;
                     vm.description = data.data.description;
-                    vm.join_group_setting[data.data.join_group_setting] = true;
+                    vm.checked_setting = data.data.join_group_setting.toString();
                 }
                 else {
                     bs_alert(data.data);
diff --git a/template/admin/group/group_detail.html b/template/admin/group/group_detail.html
index e087838..dc695e0 100644
--- a/template/admin/group/group_detail.html
+++ b/template/admin/group/group_detail.html
@@ -43,9 +43,9 @@
         <div class="col-md-12">
             <div class="form-group">
                 <label>加入小组设置</label>
-                <input type="radio" name="join_group_setting" value="0" ms-duplex-checked="join_group_setting[0]">允许任何人加入
-                <input type="radio" name="join_group_setting" value="1" ms-duplex-checked="join_group_setting[1]">提交请求后管理员审核
-                <input type="radio" name="join_group_setting" value="2" ms-duplex-checked="join_group_setting[2]">不允许任何人加入
+                <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">