Merge branch 'dev' into virusdefender-dev

* dev:
  修改group测试中部分代码
  前端 增加修改小组信息部分
  修改group/views中的命名错误
  group测试增加 加入小组请求测试并完善
  去除发布、编辑题目测试中代码冗余的问题
This commit is contained in:
virusdefender
2015-08-12 20:03:17 +08:00
8 changed files with 212 additions and 105 deletions

View File

@@ -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);
}
}
})
});
});
});