Explorar o código

修改非文档库成员可看到返回编辑按钮的 bug

xunjianxiang %!s(int64=8) %!d(string=hai) anos
pai
achega
30cdcce948
Modificáronse 2 ficheiros con 4 adicións e 5 borrados
  1. 2 5
      controllers/document.go
  2. 2 0
      views/document/default_read.tpl

+ 2 - 5
controllers/document.go

@@ -42,12 +42,9 @@ func isReadable(identify, token string, c *DocumentController) *models.BookResul
 		beego.Error(err)
 		c.Abort("500")
 	}
-	if c.Member != nil && c.Member.IsAdministrator() {
-		bookResult := book.ToBookResult()
-		return bookResult
-	}
+
 	//如果文档是私有的
-	if book.PrivatelyOwned == 1 {
+	if book.PrivatelyOwned == 1 && !c.Member.IsAdministrator() {
 
 		is_ok := false
 

+ 2 - 0
views/document/default_read.tpl

@@ -47,9 +47,11 @@
                     </button>
                     <ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="dLabel">
                         {{if gt .Member.MemberId 0}}
+                        {{if gt .Model.RelationshipId 0}}
                         {{if eq .Model.RoleId 0 1 2}}
                         <li><a href="{{urlfor "DocumentController.Edit" ":key" .Model.Identify ":id" ""}}">返回编辑</a> </li>
                         {{end}}
+                        {{end}}
                         <li><a href="{{urlfor "BookController.Index"}}">我的项目</a> </li>
                         <li role="presentation" class="divider"></li>
                         {{end}}