Accept Merge Request #70 : (virusdefender-dev -> dev)

Merge Request: 修复 radio 绑定的问题
Created By: @virusdefender
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/70
This commit is contained in:
virusdefender
2015-08-11 20:14:12 +08:00
6 changed files with 16 additions and 20 deletions

View File

@@ -14,11 +14,7 @@ require(["jquery", "avalon", "csrf", "bs_alert", "validation"], function ($, ava
name: "", name: "",
description: "", description: "",
join_group_setting: {0: false, 1: false, 2: false}, join_group_setting: {0: false, 1: false, 2: false},
checked_setting: 0, checked_setting: "0",
getSettingChecked: function (setting) {
return setting == vm.join_group_setting;
},
updateGroupInfo: function () { updateGroupInfo: function () {
$.ajax({ $.ajax({
@@ -26,7 +22,7 @@ require(["jquery", "avalon", "csrf", "bs_alert", "validation"], function ($, ava
url: "/api/admin/group/", url: "/api/admin/group/",
method: "put", method: "put",
data: {group_id: avalon.vmodels.admin.group_id, name: vm.name, 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", dataType: "json",
success: function (data) { success: function (data) {
if (!data.code) { if (!data.code) {
@@ -107,7 +103,7 @@ require(["jquery", "avalon", "csrf", "bs_alert", "validation"], function ($, ava
if (!data.code) { if (!data.code) {
vm.name = data.data.name; vm.name = data.data.name;
vm.description = data.data.description; 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 { else {
bs_alert(data.data); bs_alert(data.data);

View File

@@ -27,8 +27,8 @@
</div> </div>
<div class="text-right"> <div class="text-right">
页数:{{page}}/{{page_count}}&nbsp;&nbsp; 页数:{{page}}/{{page_count}}&nbsp;&nbsp;
<botton ms-attr-class="getBtnClass(0)" ms-click="getPrevious">上一页</botton> <button ms-attr-class="getBtnClass(0)" ms-click="getPrevious">上一页</button>
<botton ms-attr-class="getBtnClass(1)" ms-click="getNext">下一页</botton> <button ms-attr-class="getBtnClass(1)" ms-click="getNext">下一页</button>
</div> </div>
<div ms-visible="isEditing"> <div ms-visible="isEditing">

View File

@@ -35,8 +35,8 @@
<div class="text-right"> <div class="text-right">
页数:{{page}}/{{page_count}}&nbsp;&nbsp; 页数:{{page}}/{{page_count}}&nbsp;&nbsp;
<botton ms-attr-class="getBtnClass(0)" ms-click="getPrevious">上一页</botton> <button ms-attr-class="getBtnClass(0)" ms-click="getPrevious">上一页</button>
<botton ms-attr-class="getBtnClass(1)" ms-click="getNext">下一页</botton> <button ms-attr-class="getBtnClass(1)" ms-click="getNext">下一页</button>
</div> </div>
</div> </div>

View File

@@ -22,8 +22,8 @@
<div class="text-right"> <div class="text-right">
页数:{{ page }}/{{ page_count }}&nbsp;&nbsp; 页数:{{ page }}/{{ page_count }}&nbsp;&nbsp;
<botton ms-attr-class="getBtnClass(0)" ms-click="getPrevious">上一页</botton> <button ms-attr-class="getBtnClass(0)" ms-click="getPrevious">上一页</button>
<botton ms-attr-class="getBtnClass(1)" ms-click="getNext">下一页</botton> <button ms-attr-class="getBtnClass(1)" ms-click="getNext">下一页</button>
</div> </div>
<h1>修改小组信息</h1> <h1>修改小组信息</h1>
@@ -43,9 +43,9 @@
<div class="col-md-12"> <div class="col-md-12">
<div class="form-group"> <div class="form-group">
<label>加入小组设置</label> <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="0" ms-duplex-string="checked_setting">允许任何人加入
<input type="radio" name="join_group_setting" value="1" ms-duplex-checked="join_group_setting[1]">提交请求后管理员审核 <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-checked="join_group_setting[2]">不允许任何人加入 <input type="radio" name="join_group_setting" value="2" ms-duplex-string="checked_setting">不允许任何人加入
</div> </div>
</div> </div>
<div class="col-md-12"> <div class="col-md-12">

View File

@@ -23,8 +23,8 @@
<div class="text-right"> <div class="text-right">
页数:{{page}}/{{page_count}}&nbsp;&nbsp; 页数:{{page}}/{{page_count}}&nbsp;&nbsp;
<botton ms-attr-class="getBtnClass(0)" ms-click="getPrevious">上一页</botton> <button ms-attr-class="getBtnClass(0)" ms-click="getPrevious">上一页</button>
<botton ms-attr-class="getBtnClass(1)" ms-click="getNext">下一页</botton> <button ms-attr-class="getBtnClass(1)" ms-click="getNext">下一页</button>
</div> </div>
</div> </div>

View File

@@ -39,8 +39,8 @@
</div> </div>
<div class="text-right"> <div class="text-right">
页数:{{page}}/{{page_count}}&nbsp;&nbsp; 页数:{{page}}/{{page_count}}&nbsp;&nbsp;
<botton ms-attr-class="getBtnClass(0)" ms-click="getPrevious">上一页</botton> <button ms-attr-class="getBtnClass(0)" ms-click="getPrevious">上一页</button>
<botton ms-attr-class="getBtnClass(1)" ms-click="getNext">下一页</botton> <button ms-attr-class="getBtnClass(1)" ms-click="getNext">下一页</button>
</div> </div>
<div ms-visible="isEditing"> <div ms-visible="isEditing">
<h3>修改用户信息</h3> <h3>修改用户信息</h3>