Golint fixed for modules/context

release/v1.15
Lunny Xiao 2016-11-25 14:51:01 +08:00
parent 6a28909f40
commit faabc76fd6
7 changed files with 20 additions and 3 deletions

View File

@ -16,6 +16,7 @@ import (
macaron "gopkg.in/macaron.v1" macaron "gopkg.in/macaron.v1"
) )
// APIContext is a specific macaron context for API service
type APIContext struct { type APIContext struct {
*Context *Context
Org *APIOrganization Org *APIOrganization
@ -63,6 +64,7 @@ func (ctx *APIContext) SetLinkHeader(total, pageSize int) {
} }
} }
// APIContexter returns apicontext as macaron middleware
func APIContexter() macaron.Handler { func APIContexter() macaron.Handler {
return func(c *Context) { return func(c *Context) {
ctx := &APIContext{ ctx := &APIContext{

View File

@ -8,6 +8,7 @@ import (
"code.gitea.io/gitea/models" "code.gitea.io/gitea/models"
) )
// APIOrganization contains organization and team
type APIOrganization struct { type APIOrganization struct {
Organization *models.User Organization *models.User
Team *models.Team Team *models.Team

View File

@ -13,6 +13,7 @@ import (
macaron "gopkg.in/macaron.v1" macaron "gopkg.in/macaron.v1"
) )
// ToggleOptions contains required or check options
type ToggleOptions struct { type ToggleOptions struct {
SignInRequired bool SignInRequired bool
SignOutRequired bool SignOutRequired bool
@ -20,6 +21,7 @@ type ToggleOptions struct {
DisableCSRF bool DisableCSRF bool
} }
// Toggle returns toggle options as middleware
func Toggle(options *ToggleOptions) macaron.Handler { func Toggle(options *ToggleOptions) macaron.Handler {
return func(ctx *Context) { return func(ctx *Context) {
// Cannot view any page before installation. // Cannot view any page before installation.

View File

@ -40,8 +40,8 @@ type Context struct {
Org *Organization Org *Organization
} }
// HasError returns true if error occurs in form validation. // HasAPIError returns true if error occurs in form validation.
func (ctx *Context) HasApiError() bool { func (ctx *Context) HasAPIError() bool {
hasErr, ok := ctx.Data["HasError"] hasErr, ok := ctx.Data["HasError"]
if !ok { if !ok {
return false return false
@ -49,6 +49,7 @@ func (ctx *Context) HasApiError() bool {
return hasErr.(bool) return hasErr.(bool)
} }
// GetErrMsg returns error message
func (ctx *Context) GetErrMsg() string { func (ctx *Context) GetErrMsg() string {
return ctx.Data["ErrorMsg"].(string) return ctx.Data["ErrorMsg"].(string)
} }
@ -116,6 +117,7 @@ func (ctx *Context) NotFoundOrServerError(title string, errck func(error) bool,
ctx.Handle(500, title, err) ctx.Handle(500, title, err)
} }
// HandleText handles HTTP status code
func (ctx *Context) HandleText(status int, title string) { func (ctx *Context) HandleText(status int, title string) {
if (status/100 == 4) || (status/100 == 5) { if (status/100 == 4) || (status/100 == 5) {
log.Error(4, "%s", title) log.Error(4, "%s", title)
@ -123,6 +125,7 @@ func (ctx *Context) HandleText(status int, title string) {
ctx.PlainText(status, []byte(title)) ctx.PlainText(status, []byte(title))
} }
// ServeContent serves content to http request
func (ctx *Context) ServeContent(name string, r io.ReadSeeker, params ...interface{}) { func (ctx *Context) ServeContent(name string, r io.ReadSeeker, params ...interface{}) {
modtime := time.Now() modtime := time.Now()
for _, p := range params { for _, p := range params {

View File

@ -12,6 +12,7 @@ import (
macaron "gopkg.in/macaron.v1" macaron "gopkg.in/macaron.v1"
) )
// Organization contains organization context
type Organization struct { type Organization struct {
IsOwner bool IsOwner bool
IsMember bool IsMember bool
@ -23,6 +24,7 @@ type Organization struct {
Team *models.Team Team *models.Team
} }
// HandleOrgAssignment handles organization assignment
func HandleOrgAssignment(ctx *Context, args ...bool) { func HandleOrgAssignment(ctx *Context, args ...bool) {
var ( var (
requireMember bool requireMember bool
@ -145,6 +147,7 @@ func HandleOrgAssignment(ctx *Context, args ...bool) {
} }
} }
// OrgAssignment returns a macaron middleware to handle organization assignment
func OrgAssignment(args ...bool) macaron.Handler { func OrgAssignment(args ...bool) macaron.Handler {
return func(ctx *Context) { return func(ctx *Context) {
HandleOrgAssignment(ctx, args...) HandleOrgAssignment(ctx, args...)

View File

@ -19,6 +19,7 @@ import (
macaron "gopkg.in/macaron.v1" macaron "gopkg.in/macaron.v1"
) )
// PullRequest contains informations to make a pull request
type PullRequest struct { type PullRequest struct {
BaseRepo *models.Repository BaseRepo *models.Repository
Allowed bool Allowed bool
@ -26,6 +27,7 @@ type PullRequest struct {
HeadInfo string // [<user>:]<branch> HeadInfo string // [<user>:]<branch>
} }
// Repository contains informations to operate a repository
type Repository struct { type Repository struct {
AccessMode models.AccessMode AccessMode models.AccessMode
IsWatching bool IsWatching bool
@ -96,6 +98,7 @@ func (r *Repository) GetEditorconfig() (*editorconfig.Editorconfig, error) {
return editorconfig.ParseBytes(data) return editorconfig.ParseBytes(data)
} }
// RetrieveBaseRepo retrieves base repository
func RetrieveBaseRepo(ctx *Context, repo *models.Repository) { func RetrieveBaseRepo(ctx *Context, repo *models.Repository) {
// Non-fork repository will not return error in this method. // Non-fork repository will not return error in this method.
if err := repo.GetBaseRepo(); err != nil { if err := repo.GetBaseRepo(); err != nil {
@ -130,6 +133,7 @@ func earlyResponseForGoGetMeta(ctx *Context) {
}))) })))
} }
// RepoAssignment returns a macaron to handle repository assignment
func RepoAssignment(args ...bool) macaron.Handler { func RepoAssignment(args ...bool) macaron.Handler {
return func(ctx *Context) { return func(ctx *Context) {
var ( var (
@ -446,6 +450,7 @@ func RepoRef() macaron.Handler {
} }
} }
// RequireRepoAdmin returns a macaron middleware for requiring repository admin permission
func RequireRepoAdmin() macaron.Handler { func RequireRepoAdmin() macaron.Handler {
return func(ctx *Context) { return func(ctx *Context) {
if !ctx.IsSigned || (!ctx.Repo.IsAdmin() && !ctx.User.IsAdmin) { if !ctx.IsSigned || (!ctx.Repo.IsAdmin() && !ctx.User.IsAdmin) {
@ -455,6 +460,7 @@ func RequireRepoAdmin() macaron.Handler {
} }
} }
// RequireRepoWriter returns a macaron middleware for requiring repository write permission
func RequireRepoWriter() macaron.Handler { func RequireRepoWriter() macaron.Handler {
return func(ctx *Context) { return func(ctx *Context) {
if !ctx.IsSigned || (!ctx.Repo.IsWriter() && !ctx.User.IsAdmin) { if !ctx.IsSigned || (!ctx.Repo.IsWriter() && !ctx.User.IsAdmin) {

View File

@ -14,7 +14,7 @@ import (
// Markdown render markdown document to HTML // Markdown render markdown document to HTML
// see https://github.com/gogits/go-gogs-client/wiki/Miscellaneous#render-an-arbitrary-markdown-document // see https://github.com/gogits/go-gogs-client/wiki/Miscellaneous#render-an-arbitrary-markdown-document
func Markdown(ctx *context.APIContext, form api.MarkdownOption) { func Markdown(ctx *context.APIContext, form api.MarkdownOption) {
if ctx.HasApiError() { if ctx.HasAPIError() {
ctx.Error(422, "", ctx.GetErrMsg()) ctx.Error(422, "", ctx.GetErrMsg())
return return
} }