mirror of
https://github.com/go-gitea/gitea
synced 2024-08-19 05:40:43 +02:00
merge
This commit is contained in:
parent
555c8f1d91
commit
fecafdca2a
@ -6,8 +6,6 @@ package repo
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
"github.com/codegangsta/martini"
|
|
||||||
"github.com/martini-contrib/render"
|
"github.com/martini-contrib/render"
|
||||||
"github.com/martini-contrib/sessions"
|
"github.com/martini-contrib/sessions"
|
||||||
|
|
||||||
@ -87,20 +85,6 @@ func Delete(req *http.Request, r render.Render, data base.TmplData, session sess
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func Repo(params martini.Params, req *http.Request, r render.Render, data base.TmplData, session sessions.Session) {
|
|
||||||
data["Title"] = "Repository"
|
|
||||||
files, err := models.GetReposFiles(params["username"], params["reponame"], "HEAD", "/")
|
|
||||||
if err != nil {
|
|
||||||
data["ErrorMsg"] = err
|
|
||||||
log.Error("repo.List: %v", err)
|
|
||||||
r.HTML(200, "base/error", data)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
data["Files"] = files
|
|
||||||
r.HTML(200, "repo/repo", data)
|
|
||||||
}
|
|
||||||
|
|
||||||
func List(req *http.Request, r render.Render, data base.TmplData, session sessions.Session) {
|
func List(req *http.Request, r render.Render, data base.TmplData, session sessions.Session) {
|
||||||
u := auth.SignedInUser(session)
|
u := auth.SignedInUser(session)
|
||||||
if u != nil {
|
if u != nil {
|
||||||
|
@ -1,16 +1,17 @@
|
|||||||
package repo
|
package repo
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"net/http"
|
||||||
|
|
||||||
"github.com/codegangsta/martini"
|
"github.com/codegangsta/martini"
|
||||||
"github.com/gogits/gogs/models"
|
"github.com/gogits/gogs/models"
|
||||||
"github.com/gogits/gogs/modules/auth"
|
"github.com/gogits/gogs/modules/auth"
|
||||||
"github.com/gogits/gogs/modules/base"
|
"github.com/gogits/gogs/modules/base"
|
||||||
"github.com/martini-contrib/render"
|
"github.com/martini-contrib/render"
|
||||||
"github.com/martini-contrib/sessions"
|
"github.com/martini-contrib/sessions"
|
||||||
"net/http"
|
"github.com/qiniu/log"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
func Single(params martini.Params, req *http.Request, r render.Render, data base.TmplData, session sessions.Session) {
|
func Single(params martini.Params, req *http.Request, r render.Render, data base.TmplData, session sessions.Session) {
|
||||||
var (
|
var (
|
||||||
user *models.User
|
user *models.User
|
||||||
@ -52,5 +53,14 @@ func Single(params martini.Params, req *http.Request, r render.Render, data base
|
|||||||
data["RepositoryLink"] = data["Title"]
|
data["RepositoryLink"] = data["Title"]
|
||||||
data["IsRepoToolbarSource"] = true
|
data["IsRepoToolbarSource"] = true
|
||||||
|
|
||||||
|
files, err := models.GetReposFiles(params["username"], params["reponame"], "HEAD", "/")
|
||||||
|
if err != nil {
|
||||||
|
data["ErrorMsg"] = err
|
||||||
|
log.Error("repo.List: %v", err)
|
||||||
|
r.HTML(200, "base/error", data)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
data["Files"] = files
|
||||||
r.HTML(200, "repo/single", data)
|
r.HTML(200, "repo/single", data)
|
||||||
}
|
}
|
||||||
|
@ -1,10 +0,0 @@
|
|||||||
{{template "base/head" .}}
|
|
||||||
{{template "base/navbar" .}}
|
|
||||||
<div class="container" id="gogs-body">
|
|
||||||
<ul>
|
|
||||||
{{range .Files}}
|
|
||||||
<li>{{.Name}} - {{.Type}}</li>
|
|
||||||
{{end}}
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
{{template "base/footer" .}}
|
|
@ -33,6 +33,10 @@
|
|||||||
</div>
|
</div>
|
||||||
{{template "repo/toolbar" .}}
|
{{template "repo/toolbar" .}}
|
||||||
<div id="gogs-body" class="container">
|
<div id="gogs-body" class="container">
|
||||||
repo single dashboard
|
<ul>
|
||||||
|
{{range .Files}}
|
||||||
|
<li>{{.Name}} - {{.Type}}</li>
|
||||||
|
{{end}}
|
||||||
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
{{template "base/footer" .}}
|
{{template "base/footer" .}}
|
2
web.go
2
web.go
@ -70,8 +70,6 @@ func runWeb(*cli.Context) {
|
|||||||
|
|
||||||
m.Get("/user/:username", auth.SignInRequire(false), user.Profile)
|
m.Get("/user/:username", auth.SignInRequire(false), user.Profile)
|
||||||
|
|
||||||
m.Get("/:username/:reponame", repo.Repo)
|
|
||||||
|
|
||||||
m.Any("/repo/create", auth.SignInRequire(true), binding.BindIgnErr(auth.CreateRepoForm{}), repo.Create)
|
m.Any("/repo/create", auth.SignInRequire(true), binding.BindIgnErr(auth.CreateRepoForm{}), repo.Create)
|
||||||
m.Any("/repo/delete", auth.SignInRequire(true), repo.Delete)
|
m.Any("/repo/delete", auth.SignInRequire(true), repo.Delete)
|
||||||
m.Any("/repo/list", auth.SignInRequire(false), repo.List)
|
m.Any("/repo/list", auth.SignInRequire(false), repo.List)
|
||||||
|
Loading…
Reference in New Issue
Block a user