add list for repo basic

tokarchuk/v1.17
Lunny Xiao 11 years ago
parent 90223dcfc4
commit e246f2188e
  1. 43
      routers/repo/repo.go
  2. 4
      templates/repo/create.tmpl
  3. 10
      templates/repo/list.tmpl
  4. 1
      web.go

@ -12,32 +12,37 @@ import (
"github.com/martini-contrib/render" "github.com/martini-contrib/render"
"github.com/gogits/gogs/models" "github.com/gogits/gogs/models"
"github.com/gogits/gogs/routers/user"
"github.com/martini-contrib/sessions"
) )
func Create(req *http.Request, r render.Render) { func Create(req *http.Request, r render.Render, session sessions.Session) {
if req.Method == "GET" { if req.Method == "GET" {
r.HTML(200, "repo/create", map[string]interface{}{ r.HTML(200, "repo/create", map[string]interface{}{
"Title": "Create repository", "Title": "Create repository",
"UserName": user.SignedInName(session),
"UserId": user.SignedInId(session),
"IsSigned": user.IsSignedIn(session),
}) })
return return
} }
// TODO: access check // TODO: access check
//fmt.Println(req.FormValue("userId"), req.FormValue("name"))
id, err := strconv.ParseInt(req.FormValue("userId"), 10, 64) id, err := strconv.ParseInt(req.FormValue("userId"), 10, 64)
if err == nil { if err == nil {
var user *models.User var u *models.User
user, err = models.GetUserById(id) u, err = models.GetUserById(id)
if user == nil { if u == nil {
err = models.ErrUserNotExist err = models.ErrUserNotExist
} }
if err == nil { if err == nil {
_, err = models.CreateRepository(user, req.FormValue("name")) _, err = models.CreateRepository(u, req.FormValue("name"))
} }
if err == nil { if err == nil {
r.HTML(200, "repo/created", map[string]interface{}{ r.HTML(200, "repo/created", map[string]interface{}{
"RepoName": user.Name + "/" + req.FormValue("name"), "RepoName": u.Name + "/" + req.FormValue("name"),
"IsSigned": user.IsSignedIn(session),
}) })
return return
} }
@ -46,14 +51,16 @@ func Create(req *http.Request, r render.Render) {
if err != nil { if err != nil {
r.HTML(200, "base/error", map[string]interface{}{ r.HTML(200, "base/error", map[string]interface{}{
"Error": fmt.Sprintf("%v", err), "Error": fmt.Sprintf("%v", err),
"IsSigned": user.IsSignedIn(session),
}) })
} }
} }
func Delete(req *http.Request, r render.Render) { func Delete(req *http.Request, r render.Render, session sessions.Session) {
if req.Method == "GET" { if req.Method == "GET" {
r.HTML(200, "repo/delete", map[string]interface{}{ r.HTML(200, "repo/delete", map[string]interface{}{
"Title": "Delete repository", "Title": "Delete repository",
"IsSigned": user.IsSignedIn(session),
}) })
return return
} }
@ -63,6 +70,26 @@ func Delete(req *http.Request, r render.Render) {
if err != nil { if err != nil {
r.HTML(200, "base/error", map[string]interface{}{ r.HTML(200, "base/error", map[string]interface{}{
"Error": fmt.Sprintf("%v", err), "Error": fmt.Sprintf("%v", err),
"IsSigned": user.IsSignedIn(session),
}) })
} }
} }
func List(req *http.Request, r render.Render, session sessions.Session) {
u := user.SignedInUser(session)
repos, err := models.GetRepositories(u)
fmt.Println("repos", repos)
if err != nil {
r.HTML(200, "base/error", map[string]interface{}{
"Error": fmt.Sprintf("%v", err),
"IsSigned": user.IsSignedIn(session),
})
return
}
r.HTML(200, "repo/list", map[string]interface{}{
"Title": "repositories",
"Repos": repos,
"IsSigned": user.IsSignedIn(session),
})
}

@ -6,8 +6,8 @@
<div class="form-group"> <div class="form-group">
<label class="col-md-2 control-label">Owner<strong class="text-danger">*</strong></label> <label class="col-md-2 control-label">Owner<strong class="text-danger">*</strong></label>
<div class="col-md-8"> <div class="col-md-8">
<p class="form-control-static">Owner-name</p> <p class="form-control-static">{{.UserName}}</p>
<input type="hidden" value="1" name="user-id"/> <input type="hidden" value="{{.UserId}}" name="userId"/>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">

@ -0,0 +1,10 @@
{{template "base/head" .}}
{{template "base/navbar" .}}
<div class="container" id="gogs-body">
<ul>
{{range .Repos}}
<li>{{.Name}} stars: {{.NumStars}} forks: {{.NumForks}} watches:{{.NumWatchs}}</li>
{{end}}
</ul>
</div>
{{template "base/footer" .}}

@ -67,6 +67,7 @@ func runWeb(*cli.Context) {
m.Any("/user/publickey/add", user.AddPublicKey) m.Any("/user/publickey/add", user.AddPublicKey)
m.Any("/repo/create", repo.Create) m.Any("/repo/create", repo.Create)
m.Any("/repo/delete", repo.Delete) m.Any("/repo/delete", repo.Delete)
m.Any("/repo/list", repo.List)
listenAddr := fmt.Sprintf("%s:%s", listenAddr := fmt.Sprintf("%s:%s",
utils.Cfg.MustValue("server", "HTTP_ADDR"), utils.Cfg.MustValue("server", "HTTP_ADDR"),

Loading…
Cancel
Save