mirror/yapi
2
0
Fork 0
mirror of https://github.com/YMFE/yapi.git synced 2025-01-18 13:04:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 用户删除后，项目成员和接口成员删除bug

Browse Source
This commit is contained in:
gaoxiaolin.gao 2018-06-28 19:53:56 +08:00
parent f768900716
commit 1e8ec416be
1 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
server/controllers/project.js
View File

@ -343,10 +343,9 @@ class projectController extends baseController {
if (this.getRole() !== 'admin') {
let userdata = await yapi.commons.getUserdata(uid, 'owner');
let check = await this.Model.checkMemberRepeat(copyId, uid);
if(check === 0){
if (check === 0) {
copyProjectMembers.push(userdata);
}
}
await this.Model.addMember(result._id, copyProjectMembers);
@ -437,37 +436,40 @@ class projectController extends baseController {
*/
async delMember(ctx) {
let params = ctx.params;
try {
let params = ctx.params;
var check = await this.Model.checkMemberRepeat(params.id, params.member_uid);
if (check === 0) {
return (ctx.body = yapi.commons.resReturn(null, 400, '项目成员不存在'));
}
var check = await this.Model.checkMemberRepeat(params.id, params.member_uid);
if (check === 0) {
return (ctx.body = yapi.commons.resReturn(null, 400, '项目成员不存在'));
}
if ((await this.checkAuth(params.id, 'project', 'danger')) !== true) {
return (ctx.body = yapi.commons.resReturn(null, 405, '没有权限'));
}
if ((await this.checkAuth(params.id, 'project', 'danger')) !== true) {
return (ctx.body = yapi.commons.resReturn(null, 405, '没有权限'));
}
let result = await this.Model.delMember(params.id, params.member_uid);
let username = this.getUsername();
yapi
.getInst(userModel)
.findById(params.member_uid)
.then(member => {
yapi.commons.saveLog({
content: `<a href="/user/profile/${this.getUid()}">${username}</a> 删除了项目中的成员 <a href="/user/profile/${
params.member_uid
}">${member.username}</a>`,
type: 'project',
uid: this.getUid(),
username: username,
typeid: params.id
let result = await this.Model.delMember(params.id, params.member_uid);
let username = this.getUsername();
yapi
.getInst(userModel)
.findById(params.member_uid)
.then(member => {
yapi.commons.saveLog({
content: `<a href="/user/profile/${this.getUid()}">${username}</a> 删除了项目中的成员 <a href="/user/profile/${
params.member_uid
}">${member? member.username: ''}</a>`,
type: 'project',
uid: this.getUid(),
username: username,
typeid: params.id
});
});
});
ctx.body = yapi.commons.resReturn(result);
ctx.body = yapi.commons.resReturn(result);
} catch (e) {
ctx.body = yapi.commons.resReturn(null, 402, e.message);
}
}
/**
* 获取项目成员列表
* @interface /project/get_member_list
@ -682,18 +684,20 @@ class projectController extends baseController {
let projectInst = yapi.getInst(projectModel);
var check = await projectInst.checkMemberRepeat(params.id, params.member_uid);
if (check === 0) {
return ctx.body = yapi.commons.resReturn(null, 400, '项目成员不存在');
return (ctx.body = yapi.commons.resReturn(null, 400, '项目成员不存在'));
}
let result = await projectInst.changeMemberEmailNotice(params.id, params.member_uid, params.notice);
let result = await projectInst.changeMemberEmailNotice(
params.id,
params.member_uid,
params.notice
);
ctx.body = yapi.commons.resReturn(result);
}catch (e) {
} catch (e) {
ctx.body = yapi.commons.resReturn(null, 402, e.message);
}
}
/**
* 项目头像设置
* @interface /project/upset
@ -884,8 +888,7 @@ class projectController extends baseController {
}
}
/**
/**
* 获取项目的环境变量值
* @interface /project/get_env
* @method GET
@ -911,15 +914,13 @@ class projectController extends baseController {
let env = await this.Model.getByEnv(project_id);
// console.log('project', projectData)
ctx.body = yapi.commons.resReturn(env);
} catch (e) {
ctx.body = yapi.commons.resReturn(null, 402, e.message);
}
}
arrRepeat(arr, key) {
const s = new Set();
arr.forEach(item => s.add(item[key]));
@ -1015,7 +1016,7 @@ class projectController extends baseController {
let projectList = await this.Model.search(q);
let groupList = await this.groupModel.search(q);
let interfaceList = await this.interfaceModel.search(q);
let projectRules = [
'_id',
'name',
@ -1044,7 +1045,6 @@ class projectController extends baseController {
{ key: 'up_time', alias: 'upTime' }
];
projectList = commons.filterRes(projectList, projectRules);
groupList = commons.filterRes(groupList, groupRules);
interfaceList = commons.filterRes(interfaceList, interfaceRules);