fix #1997
This commit is contained in:
		
							parent
							
								
									ee686f6231
								
							
						
					
					
						commit
						2158e6fc43
					
				
							
								
								
									
										2
									
								
								gogs.go
								
								
								
								
							
							
						
						
									
										2
									
								
								gogs.go
								
								
								
								
							|  | @ -17,7 +17,7 @@ import ( | |||
| 	"github.com/gogits/gogs/modules/setting" | ||||
| ) | ||||
| 
 | ||||
| const APP_VER = "0.7.18.1118 Beta" | ||||
| const APP_VER = "0.7.18.1119 Beta" | ||||
| 
 | ||||
| func init() { | ||||
| 	runtime.GOMAXPROCS(runtime.NumCPU()) | ||||
|  |  | |||
|  | @ -36,19 +36,19 @@ func accessLevel(e Engine, u *User, repo *Repository) (AccessMode, error) { | |||
| 		mode = ACCESS_MODE_READ | ||||
| 	} | ||||
| 
 | ||||
| 	if u != nil { | ||||
| 		if u.Id == repo.OwnerID { | ||||
| 			return ACCESS_MODE_OWNER, nil | ||||
| 		} | ||||
| 
 | ||||
| 		a := &Access{UserID: u.Id, RepoID: repo.ID} | ||||
| 		if has, err := e.Get(a); !has || err != nil { | ||||
| 			return mode, err | ||||
| 		} | ||||
| 		return a.Mode, nil | ||||
| 	if u == nil { | ||||
| 		return mode, nil | ||||
| 	} | ||||
| 
 | ||||
| 	return mode, nil | ||||
| 	if u.Id == repo.OwnerID { | ||||
| 		return ACCESS_MODE_OWNER, nil | ||||
| 	} | ||||
| 
 | ||||
| 	a := &Access{UserID: u.Id, RepoID: repo.ID} | ||||
| 	if has, err := e.Get(a); !has || err != nil { | ||||
| 		return mode, err | ||||
| 	} | ||||
| 	return a.Mode, nil | ||||
| } | ||||
| 
 | ||||
| // AccessLevel returns the Access a user has to a repository. Will return NoneAccess if the
 | ||||
|  |  | |||
|  | @ -275,7 +275,7 @@ func RepoAssignment(redirect bool, args ...bool) macaron.Handler { | |||
| 		} | ||||
| 
 | ||||
| 		// Admin has super access.
 | ||||
| 		if ctx.User.IsAdmin { | ||||
| 		if ctx.IsSigned && ctx.User.IsAdmin { | ||||
| 			ctx.Repo.AccessMode = models.ACCESS_MODE_OWNER | ||||
| 		} else { | ||||
| 			mode, err := models.AccessLevel(ctx.User, repo) | ||||
|  |  | |||
|  | @ -1 +1 @@ | |||
| 0.7.18.1118 Beta | ||||
| 0.7.18.1119 Beta | ||||
		Loading…
	
		Reference in New Issue