diff options
| -rw-r--r-- | routers/repo/repo.go | 51 | ||||
| -rw-r--r-- | templates/repo/create.tmpl | 4 | ||||
| -rw-r--r-- | templates/repo/list.tmpl | 10 | ||||
| -rw-r--r-- | web.go | 1 |
4 files changed, 52 insertions, 14 deletions
diff --git a/routers/repo/repo.go b/routers/repo/repo.go index a9e48021e5..3a958f9adb 100644 --- a/routers/repo/repo.go +++ b/routers/repo/repo.go @@ -12,32 +12,37 @@ import ( "github.com/martini-contrib/render" "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" { 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 } // TODO: access check - //fmt.Println(req.FormValue("userId"), req.FormValue("name")) id, err := strconv.ParseInt(req.FormValue("userId"), 10, 64) if err == nil { - var user *models.User - user, err = models.GetUserById(id) - if user == nil { + var u *models.User + u, err = models.GetUserById(id) + if u == nil { err = models.ErrUserNotExist } if err == nil { - _, err = models.CreateRepository(user, req.FormValue("name")) + _, err = models.CreateRepository(u, req.FormValue("name")) } if err == nil { 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 } @@ -45,15 +50,17 @@ func Create(req *http.Request, r render.Render) { if err != nil { 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" { r.HTML(200, "repo/delete", map[string]interface{}{ - "Title": "Delete repository", + "Title": "Delete repository", + "IsSigned": user.IsSignedIn(session), }) return } @@ -62,7 +69,27 @@ func Delete(req *http.Request, r render.Render) { err := models.DeleteRepository(u, "") if err != nil { 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), + }) +} diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl index a3ad06df0d..809637c4eb 100644 --- a/templates/repo/create.tmpl +++ b/templates/repo/create.tmpl @@ -6,8 +6,8 @@ <div class="form-group"> <label class="col-md-2 control-label">Owner<strong class="text-danger">*</strong></label> <div class="col-md-8"> - <p class="form-control-static">Owner-name</p> - <input type="hidden" value="1" name="user-id"/> + <p class="form-control-static">{{.UserName}}</p> + <input type="hidden" value="{{.UserId}}" name="userId"/> </div> </div> <div class="form-group"> diff --git a/templates/repo/list.tmpl b/templates/repo/list.tmpl new file mode 100644 index 0000000000..2c5432a174 --- /dev/null +++ b/templates/repo/list.tmpl @@ -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" .}}
\ No newline at end of file @@ -67,6 +67,7 @@ func runWeb(*cli.Context) { m.Any("/user/publickey/add", user.AddPublicKey) m.Any("/repo/create", repo.Create) m.Any("/repo/delete", repo.Delete) + m.Any("/repo/list", repo.List) listenAddr := fmt.Sprintf("%s:%s", utils.Cfg.MustValue("server", "HTTP_ADDR"), |