lsm/mindoc
1
0
Fork 0
mirror of https://github.com/mindoc-org/mindoc.git synced 2025-09-20 02:37:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat:实现项目团队管理功能

Browse Source
This commit is contained in:
lifei6671
2018-11-13 17:33:13 +08:00
parent 0f705f0249
commit c666fcbed8
8 changed files with 220 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
controllers/DocumentController.go
View File

@@ -1284,19 +1284,21 @@ func isReadable(identify, token string, c *DocumentController) *models.BookResul
beego.Error(err)
c.ShowErrorPage(500, "项目不存在")
}
bookResult := models.NewBookResult().ToBookResult(*book)
isOk := false
if c.Member != nil {
roleId, err := models.NewBook().FindForRoleId(book.BookId, c.Member.MemberId)
if err == nil {
isOk = true
bookResult.MemberId = c.Member.MemberId
bookResult.RoleId = roleId
}
}
// 如果文档是私有的
if book.PrivatelyOwned == 1 && !c.Member.IsAdministrator() {
is_ok := false
if c.Member != nil {
_, err := models.NewRelationship().FindForRoleId(book.BookId, c.Member.MemberId)
if err == nil {
is_ok = true
}
}
if book.PrivateToken != "" && !is_ok {
if book.PrivateToken != "" && !isOk {
// 如果有访问的 Token，并且该项目设置了访问 Token，并且和用户提供的相匹配，则记录到 Session 中。
// 如果用户未提供 Token 且用户登录了，则判断用户是否参与了该项目。
// 如果用户未登录，则从 Session 中读取 Token。
@@ -1305,36 +1307,21 @@ func isReadable(identify, token string, c *DocumentController) *models.BookResul
} else if token, ok := c.GetSession(identify).(string); !ok || !strings.EqualFold(token, book.PrivateToken) {
c.ShowErrorPage(403, "权限不足")
}
} else if !is_ok {
} else if !isOk {
c.ShowErrorPage(403, "权限不足")
}
}
bookResult := models.NewBookResult().ToBookResult(*book)
if c.Member != nil {
rel, err := models.NewRelationship().FindByBookIdAndMemberId(bookResult.BookId, c.Member.MemberId)
if err == nil {
bookResult.MemberId = rel.MemberId
bookResult.RoleId = rel.RoleId
bookResult.RelationshipId = rel.RelationshipId
} else {
//TODO 团队权限
}
}
// 判断是否需要显示评论框
if bookResult.CommentStatus == "closed" {
bookResult.IsDisplayComment = false
} else if bookResult.CommentStatus == "open" {
bookResult.IsDisplayComment = true
} else if bookResult.CommentStatus == "group_only" {
bookResult.IsDisplayComment = bookResult.RelationshipId > 0
} else if bookResult.CommentStatus == "registered_only" {
bookResult.IsDisplayComment = true
}
//// 判断是否需要显示评论框
//if bookResult.CommentStatus == "closed" {
// bookResult.IsDisplayComment = false
//} else if bookResult.CommentStatus == "open" {
// bookResult.IsDisplayComment = true
//} else if bookResult.CommentStatus == "group_only" {
// bookResult.IsDisplayComment = bookResult.RelationshipId > 0
//} else if bookResult.CommentStatus == "registered_only" {
// bookResult.IsDisplayComment = true
//}
return bookResult
}

4
controllers/TemplateController.go
View File

@@ -3,7 +3,7 @@ package controllers
import (
"github.com/lifei6671/mindoc/models"
"github.com/astaxie/beego/orm"
"github.com/qiniu/x/errors.v7"
"errors"
"strings"
"github.com/lifei6671/mindoc/conf"
)
@@ -23,7 +23,7 @@ func (c *TemplateController) isPermission() (error) {
}
if !c.Member.IsAdministrator() {
book, err := models.NewBookResult().FindByIdentify(bookIdentify, c.Member.MemberId, "book_id")
book, err := models.NewBookResult().FindByIdentify(bookIdentify, c.Member.MemberId)
if err != nil {
if err == orm.ErrNoRows {
return errors.New("项目不存在或没有权限")