From 105f97e61ce3d9f2bc8ce178d0ffcbf531bd91b3 Mon Sep 17 00:00:00 2001 From: slene Date: Sun, 30 Mar 2014 10:09:59 +0800 Subject: remove Context.IsValid & verify repo in middleware repo.go --- modules/middleware/context.go | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'modules/middleware/context.go') diff --git a/modules/middleware/context.go b/modules/middleware/context.go index d81ab999..a6aa58ee 100644 --- a/modules/middleware/context.go +++ b/modules/middleware/context.go @@ -18,6 +18,7 @@ import ( "github.com/codegangsta/martini" "github.com/gogits/cache" + "github.com/gogits/git" "github.com/gogits/session" "github.com/gogits/gogs/models" @@ -41,11 +42,18 @@ type Context struct { csrfToken string Repo struct { - IsValid bool IsOwner bool IsWatching bool + IsBranch bool + IsTag bool + IsCommit bool Repository *models.Repository Owner *models.User + Commit *git.Commit + GitRepo *git.Repository + BranchName string + CommitId string + RepoLink string CloneLink struct { SSH string HTTPS string @@ -98,6 +106,10 @@ func (ctx *Context) Handle(status int, title string, err error) { ctx.HTML(status, fmt.Sprintf("status/%d", status)) } +func (ctx *Context) Debug(msg string, args ...interface{}) { + log.Debug(msg, args...) +} + func (ctx *Context) GetCookie(name string) string { cookie, err := ctx.Req.Cookie(name) if err != nil { -- cgit v1.2.3 From 4c70249f75a8fd2a7962c9c6c0d6fec13e7f2192 Mon Sep 17 00:00:00 2001 From: slene Date: Sun, 30 Mar 2014 17:03:00 +0800 Subject: fix some link --- models/user.go | 2 +- modules/middleware/context.go | 2 +- templates/user/profile.tmpl | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'modules/middleware/context.go') diff --git a/models/user.go b/models/user.go index 6ca16ec3..a392fa76 100644 --- a/models/user.go +++ b/models/user.go @@ -67,7 +67,7 @@ type User struct { // HomeLink returns the user home page link. func (user *User) HomeLink() string { - return "/user/" + user.LowerName + return "/user/" + user.Name } // AvatarLink returns the user gravatar link. diff --git a/modules/middleware/context.go b/modules/middleware/context.go index a6aa58ee..5f1d42b1 100644 --- a/modules/middleware/context.go +++ b/modules/middleware/context.go @@ -269,7 +269,7 @@ func InitContext() martini.Handler { if user != nil { ctx.Data["SignedUser"] = user ctx.Data["SignedUserId"] = user.Id - ctx.Data["SignedUserName"] = user.LowerName + ctx.Data["SignedUserName"] = user.Name ctx.Data["IsAdmin"] = ctx.User.IsAdmin } diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index 97549d48..88ee318f 100644 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -51,7 +51,7 @@
  • {{.NumForks}}

    - {{.LowerName}} + {{.Name}}

    {{.Description}}

    Last updated {{.Updated|TimeSince}}
    @@ -63,4 +63,4 @@ -{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} -- cgit v1.2.3 From d0e6a4c25acc3414f6d0f93cc50e6dcb41111c19 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 30 Mar 2014 12:11:28 -0400 Subject: Change new martini impot path --- modules/auth/admin.go | 2 +- modules/auth/auth.go | 2 +- modules/auth/issue.go | 2 +- modules/auth/repo.go | 2 +- modules/auth/setting.go | 2 +- modules/auth/user.go | 5 ++--- modules/middleware/auth.go | 2 +- modules/middleware/context.go | 2 +- modules/middleware/logger.go | 2 +- modules/middleware/render.go | 2 +- modules/middleware/repo.go | 2 +- routers/admin/admin.go | 2 +- routers/admin/user.go | 2 +- routers/dev/template.go | 2 +- routers/install.go | 2 +- routers/repo/branch.go | 3 ++- routers/repo/commit.go | 2 +- routers/repo/issue.go | 2 +- routers/repo/pull.go | 2 +- routers/repo/repo.go | 2 +- routers/user/user.go | 2 +- web.go | 2 +- 22 files changed, 24 insertions(+), 24 deletions(-) (limited to 'modules/middleware/context.go') diff --git a/modules/auth/admin.go b/modules/auth/admin.go index eccab007..fe889c23 100644 --- a/modules/auth/admin.go +++ b/modules/auth/admin.go @@ -8,7 +8,7 @@ import ( "net/http" "reflect" - "github.com/codegangsta/martini" + "github.com/go-martini/martini" "github.com/gogits/binding" diff --git a/modules/auth/auth.go b/modules/auth/auth.go index 361f55b2..4561dd83 100644 --- a/modules/auth/auth.go +++ b/modules/auth/auth.go @@ -9,7 +9,7 @@ import ( "reflect" "strings" - "github.com/codegangsta/martini" + "github.com/go-martini/martini" "github.com/gogits/binding" diff --git a/modules/auth/issue.go b/modules/auth/issue.go index 8bf49684..36c87627 100644 --- a/modules/auth/issue.go +++ b/modules/auth/issue.go @@ -8,7 +8,7 @@ import ( "net/http" "reflect" - "github.com/codegangsta/martini" + "github.com/go-martini/martini" "github.com/gogits/binding" diff --git a/modules/auth/repo.go b/modules/auth/repo.go index 2cc93744..eddd6475 100644 --- a/modules/auth/repo.go +++ b/modules/auth/repo.go @@ -8,7 +8,7 @@ import ( "net/http" "reflect" - "github.com/codegangsta/martini" + "github.com/go-martini/martini" "github.com/gogits/binding" diff --git a/modules/auth/setting.go b/modules/auth/setting.go index 0bc6afd4..cada7eea 100644 --- a/modules/auth/setting.go +++ b/modules/auth/setting.go @@ -9,7 +9,7 @@ import ( "reflect" "strings" - "github.com/codegangsta/martini" + "github.com/go-martini/martini" "github.com/gogits/binding" diff --git a/modules/auth/user.go b/modules/auth/user.go index 6242a11c..2d3c29fd 100644 --- a/modules/auth/user.go +++ b/modules/auth/user.go @@ -8,11 +8,10 @@ import ( "net/http" "reflect" - "github.com/codegangsta/martini" - - "github.com/gogits/session" + "github.com/go-martini/martini" "github.com/gogits/binding" + "github.com/gogits/session" "github.com/gogits/gogs/models" "github.com/gogits/gogs/modules/base" diff --git a/modules/middleware/auth.go b/modules/middleware/auth.go index f50fde99..bde3be72 100644 --- a/modules/middleware/auth.go +++ b/modules/middleware/auth.go @@ -7,7 +7,7 @@ package middleware import ( "net/url" - "github.com/codegangsta/martini" + "github.com/go-martini/martini" "github.com/gogits/gogs/modules/base" ) diff --git a/modules/middleware/context.go b/modules/middleware/context.go index 5f1d42b1..d2b268cd 100644 --- a/modules/middleware/context.go +++ b/modules/middleware/context.go @@ -15,7 +15,7 @@ import ( "strings" "time" - "github.com/codegangsta/martini" + "github.com/go-martini/martini" "github.com/gogits/cache" "github.com/gogits/git" diff --git a/modules/middleware/logger.go b/modules/middleware/logger.go index dcf85246..fc8e1a81 100644 --- a/modules/middleware/logger.go +++ b/modules/middleware/logger.go @@ -11,7 +11,7 @@ import ( "runtime" "time" - "github.com/codegangsta/martini" + "github.com/go-martini/martini" ) var isWindows bool diff --git a/modules/middleware/render.go b/modules/middleware/render.go index 869ef9ab..98d485af 100644 --- a/modules/middleware/render.go +++ b/modules/middleware/render.go @@ -17,7 +17,7 @@ import ( "path/filepath" "time" - "github.com/codegangsta/martini" + "github.com/go-martini/martini" "github.com/gogits/gogs/modules/base" ) diff --git a/modules/middleware/repo.go b/modules/middleware/repo.go index 6912cd83..f446d6a8 100644 --- a/modules/middleware/repo.go +++ b/modules/middleware/repo.go @@ -9,7 +9,7 @@ import ( "fmt" "strings" - "github.com/codegangsta/martini" + "github.com/go-martini/martini" "github.com/gogits/git" diff --git a/routers/admin/admin.go b/routers/admin/admin.go index f303439f..18a43ff8 100644 --- a/routers/admin/admin.go +++ b/routers/admin/admin.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/codegangsta/martini" + "github.com/go-martini/martini" "github.com/gogits/gogs/models" "github.com/gogits/gogs/modules/base" diff --git a/routers/admin/user.go b/routers/admin/user.go index 7f66c552..9f043507 100644 --- a/routers/admin/user.go +++ b/routers/admin/user.go @@ -7,7 +7,7 @@ package admin import ( "strings" - "github.com/codegangsta/martini" + "github.com/go-martini/martini" "github.com/gogits/gogs/models" "github.com/gogits/gogs/modules/auth" diff --git a/routers/dev/template.go b/routers/dev/template.go index d2f77ac4..63d5d9a5 100644 --- a/routers/dev/template.go +++ b/routers/dev/template.go @@ -5,7 +5,7 @@ package dev import ( - "github.com/codegangsta/martini" + "github.com/go-martini/martini" "github.com/gogits/gogs/models" "github.com/gogits/gogs/modules/base" diff --git a/routers/install.go b/routers/install.go index cca652f9..2c993c55 100644 --- a/routers/install.go +++ b/routers/install.go @@ -10,7 +10,7 @@ import ( "strings" "github.com/Unknwon/goconfig" - "github.com/codegangsta/martini" + "github.com/go-martini/martini" "github.com/lunny/xorm" "github.com/gogits/gogs/models" diff --git a/routers/repo/branch.go b/routers/repo/branch.go index c598db43..ffd118ae 100644 --- a/routers/repo/branch.go +++ b/routers/repo/branch.go @@ -5,7 +5,8 @@ package repo import ( - "github.com/codegangsta/martini" + "github.com/go-martini/martini" + "github.com/gogits/gogs/models" "github.com/gogits/gogs/modules/middleware" ) diff --git a/routers/repo/commit.go b/routers/repo/commit.go index 449f6443..d29c40e6 100644 --- a/routers/repo/commit.go +++ b/routers/repo/commit.go @@ -8,7 +8,7 @@ import ( "container/list" "path" - "github.com/codegangsta/martini" + "github.com/go-martini/martini" "github.com/gogits/gogs/models" "github.com/gogits/gogs/modules/base" diff --git a/routers/repo/issue.go b/routers/repo/issue.go index b2253e9f..f2d8959a 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -9,7 +9,7 @@ import ( "net/url" "strings" - "github.com/codegangsta/martini" + "github.com/go-martini/martini" "github.com/gogits/gogs/models" "github.com/gogits/gogs/modules/auth" diff --git a/routers/repo/pull.go b/routers/repo/pull.go index 93b6a9f7..430c6a81 100644 --- a/routers/repo/pull.go +++ b/routers/repo/pull.go @@ -5,7 +5,7 @@ package repo import ( - "github.com/codegangsta/martini" + "github.com/go-martini/martini" "github.com/gogits/gogs/modules/middleware" ) diff --git a/routers/repo/repo.go b/routers/repo/repo.go index 5b0a165d..1cd3dd86 100644 --- a/routers/repo/repo.go +++ b/routers/repo/repo.go @@ -9,7 +9,7 @@ import ( "path/filepath" "strings" - "github.com/codegangsta/martini" + "github.com/go-martini/martini" "github.com/gogits/webdav" diff --git a/routers/user/user.go b/routers/user/user.go index aeaf91c9..08930e22 100644 --- a/routers/user/user.go +++ b/routers/user/user.go @@ -9,7 +9,7 @@ import ( "net/url" "strings" - "github.com/codegangsta/martini" + "github.com/go-martini/martini" "github.com/gogits/gogs/models" "github.com/gogits/gogs/modules/auth" diff --git a/web.go b/web.go index 6f252719..412dcb62 100644 --- a/web.go +++ b/web.go @@ -10,7 +10,7 @@ import ( "net/http" "github.com/codegangsta/cli" - "github.com/codegangsta/martini" + "github.com/go-martini/martini" "github.com/gogits/binding" -- cgit v1.2.3