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

opti: 个人空间显示关注项目

Browse Source
This commit is contained in:
suxiaoxin 2017-11-22 16:03:05 +08:00
parent 4c4f0feabd
commit 449e707a2e
2 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/components/Header/Header.js
View File

@ -21,12 +21,6 @@ let HeaderMenu = {
icon: 'user',
adminFlag: false
},
star: {
path: '/follow',
name: '我的关注',
icon: 'star-o',
adminFlag: false
},
solution: {
path: '/user/list',
name: '用户管理',

53
server/controllers/project.js
View File

@ -11,8 +11,7 @@ const commons = require('../utils/commons.js');
const userModel = require('../models/user.js');
const logModel = require('../models/log.js');
const followModel = require('../models/follow.js');
const Mock = require('mockjs');
const send = require('koa-send');
class projectController extends baseController {
@ -373,31 +372,45 @@ class projectController extends baseController {
return ctx.body = yapi.commons.resReturn(null, 400, '项目分组id不能为空');
}
let groupData = await this.groupModel.get(group_id);
let isPrivateGroup = false;
if(groupData.type === 'private' && this.getUid() === groupData.uid){
isPrivateGroup = true;
}
let auth = await this.checkAuth(group_id, 'group', 'view')
try {
let result = await this.Model.list(group_id);
let follow = await this.followModel.list(this.getUid());
for(let index=0, item, r = 1; index< result.length; index++){
item = result[index].toObject();
if(item.project_type === 'private' && auth === false){
r = await this.Model.checkMemberRepeat(item._id, this.getUid());
if(r === 0){
continue;
if(isPrivateGroup === false){
for(let index=0, item, r = 1; index< result.length; index++){
item = result[index].toObject();
if(item.project_type === 'private' && auth === false){
r = await this.Model.checkMemberRepeat(item._id, this.getUid());
if(r === 0){
continue;
}
}
let f = _.find(follow, (fol) => {
return fol.projectid === item._id
})
// 排序：收藏的项目放前面
if (f) {
item.follow = true;
project_list.unshift(item);
} else {
item.follow = false;
project_list.push(item);
}
}
let f = _.find(follow, (fol) => {
return fol.projectid === item._id
})
// 排序：收藏的项目放前面
if (f) {
}else{
follow = follow.map(item=>{
item = item.toObject();
item.follow = true;
project_list.unshift(item);
} else {
item.follow = false;
project_list.push(item);
}
};
return item;
})
project_list = _.uniq(follow.concat(result), item=>item._id)
}
ctx.body = yapi.commons.resReturn({
list: project_list