-##### Current version: 0.2.3 Alpha
+##### Current version: 0.2.4 Alpha
#### Due to testing purpose, data of [try.gogits.org](http://try.gogits.org) has been reset in April 6, 2014 and will reset multiple times after. Please do NOT put your important data on the site.
-##### 当前版本：0.2.3 Alpha
+##### 当前版本：0.2.4 Alpha
## 开发目的
"github.com/gogits/gogs/modules/middleware"
)
-func NewUser(ctx *middleware.Context, form auth.RegisterForm) {
+func NewUser(ctx *middleware.Context) {
ctx.Data["Title"] = "New Account"
ctx.Data["PageIsUsers"] = true
+ ctx.HTML(200, "admin/users/new")
+}
- if ctx.Req.Method == "GET" {
- ctx.HTML(200, "admin/users/new")
- return
- }
+func NewUserPost(ctx *middleware.Context, form auth.RegisterForm) {
+ ctx.Data["Title"] = "New Account"
+ ctx.Data["PageIsUsers"] = true
if form.Password != form.RetypePasswd {
ctx.Data["HasError"] = true
case models.ErrUserNameIllegal:
ctx.RenderWithErr(models.ErrRepoNameIllegal.Error(), "admin/users/new", &form)
default:
- ctx.Handle(200, "admin.user.NewUser", err)
+ ctx.Handle(500, "admin.user.NewUser", err)
}
return
}
ctx.Redirect("/admin/users")
}
-func EditUser(ctx *middleware.Context, params martini.Params, form auth.AdminEditUserForm) {
+func EditUser(ctx *middleware.Context, params martini.Params) {
ctx.Data["Title"] = "Edit Account"
ctx.Data["PageIsUsers"] = true
uid, err := base.StrTo(params["userid"]).Int()
if err != nil {
- ctx.Handle(200, "admin.user.EditUser", err)
+ ctx.Handle(404, "admin.user.EditUser", err)
return
}
u, err := models.GetUserById(int64(uid))
if err != nil {
- ctx.Handle(200, "admin.user.EditUser", err)
+ ctx.Handle(500, "admin.user.EditUser", err)
return
}
- if ctx.Req.Method == "GET" {
- ctx.Data["User"] = u
- ctx.HTML(200, "admin/users/edit")
+ ctx.Data["User"] = u
+ ctx.HTML(200, "admin/users/edit")
+}
+
+func EditUserPost(ctx *middleware.Context, params martini.Params, form auth.AdminEditUserForm) {
+ ctx.Data["Title"] = "Edit Account"
+ ctx.Data["PageIsUsers"] = true
+
+ uid, err := base.StrTo(params["userid"]).Int()
+ if err != nil {
+ ctx.Handle(404, "admin.user.EditUser", err)
+ return
+ }
+
+ u, err := models.GetUserById(int64(uid))
+ if err != nil {
+ ctx.Handle(500, "admin.user.EditUser", err)
return
}
u.IsActive = form.Active == "on"
u.IsAdmin = form.Admin == "on"
if err := models.UpdateUser(u); err != nil {
- ctx.Handle(200, "admin.user.EditUser", err)
+ ctx.Handle(500, "admin.user.EditUser", err)
return
}
-
- ctx.Data["IsSuccess"] = true
- ctx.Data["User"] = u
- ctx.HTML(200, "admin/users/edit")
-
log.Trace("%s User profile updated by admin(%s): %s", ctx.Req.RequestURI,
ctx.User.LowerName, ctx.User.LowerName)
+
+ ctx.Data["User"] = u
+ ctx.Flash.Success("Account profile has been successfully updated.")
+ ctx.Redirect("/admin/users/" + params["userid"])
}
func DeleteUser(ctx *middleware.Context, params martini.Params) {
- ctx.Data["Title"] = "Edit Account"
+ ctx.Data["Title"] = "Delete Account"
ctx.Data["PageIsUsers"] = true
+ log.Info("delete")
uid, err := base.StrTo(params["userid"]).Int()
if err != nil {
- ctx.Handle(200, "admin.user.EditUser", err)
+ ctx.Handle(404, "admin.user.EditUser", err)
return
}
u, err := models.GetUserById(int64(uid))
if err != nil {
- ctx.Handle(200, "admin.user.EditUser", err)
+ ctx.Handle(500, "admin.user.EditUser", err)
return
}
if err = models.DeleteUser(u); err != nil {
- ctx.Data["HasError"] = true
switch err {
case models.ErrUserOwnRepos:
- ctx.Data["ErrorMsg"] = "This account still has ownership of repository, owner has to delete or transfer them first."
- ctx.Data["User"] = u
- ctx.HTML(200, "admin/users/edit")
+ ctx.Flash.Error("This account still has ownership of repository, owner has to delete or transfer them first.")
+ ctx.Redirect("/admin/users/" + params["userid"])
default:
- ctx.Handle(200, "admin.user.DeleteUser", err)
+ ctx.Handle(500, "admin.user.DeleteUser", err)
}
return
}
-
log.Trace("%s User deleted by admin(%s): %s", ctx.Req.RequestURI,
ctx.User.LowerName, ctx.User.LowerName)
ctx.HTML(200, "issue/list")
}
-func CreateIssue(ctx *middleware.Context, params martini.Params, form auth.CreateIssueForm) {
+func CreateIssue(ctx *middleware.Context, params martini.Params) {
ctx.Data["Title"] = "Create issue"
ctx.Data["IsRepoToolbarIssues"] = true
ctx.Data["IsRepoToolbarIssuesList"] = false
+ ctx.HTML(200, "issue/create")
+}
- if ctx.Req.Method == "GET" {
- ctx.HTML(200, "issue/create")
- return
- }
+func CreateIssuePost(ctx *middleware.Context, params martini.Params, form auth.CreateIssueForm) {
+ ctx.Data["Title"] = "Create issue"
+ ctx.Data["IsRepoToolbarIssues"] = true
+ ctx.Data["IsRepoToolbarIssuesList"] = false
if ctx.HasError() {
ctx.HTML(200, "issue/create")
issue, err := models.CreateIssue(ctx.User.Id, ctx.Repo.Repository.Id, form.MilestoneId, form.AssigneeId,
ctx.Repo.Repository.NumIssues, form.IssueName, form.Labels, form.Content, false)
if err != nil {
- ctx.Handle(200, "issue.CreateIssue(CreateIssue)", err)
+ ctx.Handle(500, "issue.CreateIssue(CreateIssue)", err)
return
}
if err = models.NotifyWatchers(&models.Action{ActUserId: ctx.User.Id, ActUserName: ctx.User.Name, ActEmail: ctx.User.Email,
OpType: models.OP_CREATE_ISSUE, Content: fmt.Sprintf("%d|%s", issue.Index, issue.Name),
RepoId: ctx.Repo.Repository.Id, RepoName: ctx.Repo.Repository.Name, RefName: ""}); err != nil {
- ctx.Handle(200, "issue.CreateIssue(NotifyWatchers)", err)
+ ctx.Handle(500, "issue.CreateIssue(NotifyWatchers)", err)
return
}
if base.Service.NotifyMail {
tos, err := mailer.SendIssueNotifyMail(ctx.User, ctx.Repo.Owner, ctx.Repo.Repository, issue)
if err != nil {
- ctx.Handle(200, "issue.CreateIssue(SendIssueNotifyMail)", err)
+ ctx.Handle(500, "issue.CreateIssue(SendIssueNotifyMail)", err)
return
}
}
if err = mailer.SendIssueMentionMail(ctx.User, ctx.Repo.Owner, ctx.Repo.Repository,
issue, models.GetUserEmailsByNames(newTos)); err != nil {
- ctx.Handle(200, "issue.CreateIssue(SendIssueMentionMail)", err)
+ ctx.Handle(500, "issue.CreateIssue(SendIssueMentionMail)", err)
return
}
}
-
log.Trace("%d Issue created: %d", ctx.Repo.Repository.Id, issue.Id)
+
ctx.Redirect(fmt.Sprintf("/%s/%s/issues/%d", params["username"], params["reponame"], issue.Index))
}
"github.com/gogits/gogs/modules/middleware"
)
-func Create(ctx *middleware.Context, form auth.CreateRepoForm) {
+func Create(ctx *middleware.Context) {
ctx.Data["Title"] = "Create repository"
- ctx.Data["PageIsNewRepo"] = true // For navbar arrow.
+ ctx.Data["PageIsNewRepo"] = true
ctx.Data["LanguageIgns"] = models.LanguageIgns
ctx.Data["Licenses"] = models.Licenses
+ ctx.HTML(200, "repo/create")
+}
- if ctx.Req.Method == "GET" {
- ctx.HTML(200, "repo/create")
- return
- }
+func CreatePost(ctx *middleware.Context, form auth.CreateRepoForm) {
+ ctx.Data["Title"] = "Create repository"
+ ctx.Data["PageIsNewRepo"] = true
+ ctx.Data["LanguageIgns"] = models.LanguageIgns
+ ctx.Data["Licenses"] = models.Licenses
if ctx.HasError() {
ctx.HTML(200, "repo/create")
ctx.RenderWithErr(models.ErrRepoNameIllegal.Error(), "repo/create", &form)
return
}
- ctx.Handle(200, "repo.Create", err)
+ ctx.Handle(500, "repo.Create", err)
}
-func Mirror(ctx *middleware.Context, form auth.CreateRepoForm) {
+func Mirror(ctx *middleware.Context) {
ctx.Data["Title"] = "Mirror repository"
- ctx.Data["PageIsNewRepo"] = true // For navbar arrow.
+ ctx.Data["PageIsNewRepo"] = true
+ ctx.HTML(200, "repo/mirror")
+}
- if ctx.Req.Method == "GET" {
- ctx.HTML(200, "repo/mirror")
- return
- }
+func MirrorPost(ctx *middleware.Context, form auth.CreateRepoForm) {
+ ctx.Data["Title"] = "Mirror repository"
+ ctx.Data["PageIsNewRepo"] = true
if ctx.HasError() {
ctx.HTML(200, "repo/mirror")
ctx.RenderWithErr(models.ErrRepoNameIllegal.Error(), "repo/mirror", &form)
return
}
- ctx.Handle(200, "repo.Mirror", err)
+ ctx.Handle(500, "repo.Mirror", err)
}
func Single(ctx *middleware.Context, params martini.Params) {
ctx.Redirect("/user/setting")
}
-func SettingPassword(ctx *middleware.Context, form auth.UpdatePasswdForm) {
+func SettingPassword(ctx *middleware.Context) {
+ ctx.Data["Title"] = "Password"
+ ctx.Data["PageIsUserSetting"] = true
+ ctx.Data["IsUserPageSettingPasswd"] = true
+ ctx.HTML(200, "user/password")
+}
+
+func SettingPasswordPost(ctx *middleware.Context, form auth.UpdatePasswdForm) {
ctx.Data["Title"] = "Password"
ctx.Data["PageIsUserSetting"] = true
ctx.Data["IsUserPageSettingPasswd"] = true
- if ctx.Req.Method == "GET" {
+ if ctx.HasError() {
ctx.HTML(200, "user/password")
return
}
user := ctx.User
- newUser := &models.User{Passwd: form.NewPasswd}
- newUser.EncodePasswd()
- if user.Passwd != newUser.Passwd {
- ctx.Data["HasError"] = true
- ctx.Data["ErrorMsg"] = "Old password is not correct"
+ tmpUser := &models.User{
+ Passwd: form.OldPasswd,
+ Salt: user.Salt,
+ }
+ tmpUser.EncodePasswd()
+ if user.Passwd != tmpUser.Passwd {
+ ctx.Flash.Error("Old password is not correct")
} else if form.NewPasswd != form.RetypePasswd {
- ctx.Data["HasError"] = true
- ctx.Data["ErrorMsg"] = "New password and re-type password are not same"
+ ctx.Flash.Error("New password and re-type password are not same")
} else {
- newUser.Salt = models.GetUserSalt()
- user.Passwd = newUser.Passwd
+ user.Passwd = form.NewPasswd
+ user.Salt = models.GetUserSalt()
+ user.EncodePasswd()
if err := models.UpdateUser(user); err != nil {
ctx.Handle(200, "setting.SettingPassword", err)
return
}
- ctx.Data["IsSuccess"] = true
+ log.Trace("%s User password updated: %s", ctx.Req.RequestURI, ctx.User.LowerName)
+ ctx.Flash.Success("Password is changed successfully. You can now sign in via new password.")
}
- ctx.Data["Owner"] = user
- ctx.HTML(200, "user/password")
- log.Trace("%s User password updated: %s", ctx.Req.RequestURI, ctx.User.LowerName)
+ ctx.Redirect("/user/setting/password")
}
func SettingSSHKeys(ctx *middleware.Context, form auth.AddSSHKeyForm) {
<div class="panel-body">
<br/>
<form action="/admin/users/{{.User.Id}}" method="post" class="form-horizontal">
- {{if .IsSuccess}}<p class="alert alert-success">Account profile has been successfully updated.</p>{{else if .HasError}}<p class="alert alert-danger form-error">{{.ErrorMsg}}</p>{{end}}
{{.CsrfTokenHtml}}
+ {{template "base/alert" .}}
<input type="hidden" value="{{.User.Id}}" name="userId"/>
<div class="form-group">
<label class="col-md-3 control-label">Username: </label>
<br/>
<form action="/admin/users/new" method="post" class="form-horizontal">
{{.CsrfTokenHtml}}
- <div class="alert alert-danger form-error{{if .HasError}}{{else}} hidden{{end}}">{{.ErrorMsg}}</div>
+ {{template "base/alert" .}}
<div class="form-group {{if .Err_UserName}}has-error has-feedback{{end}}">
<label class="col-md-3 control-label">Username: </label>
<div class="col-md-7">
<div id="issue">
<form class="form" action="{{.RepoLink}}/issues/new" method="post" id="issue-create-form">
{{.CsrfTokenHtml}}
+ {{template "base/alert" .}}
<div class="col-md-1">
<img class="avatar" src="{{.SignedUser.AvatarLink}}" alt=""/>
</div>
<form action="/repo/create" method="post" class="form-horizontal card" id="repo-create">
{{.CsrfTokenHtml}}
<h3>Create New Repository</h3>
- <div class="alert alert-danger form-error{{if .HasError}}{{else}} hidden{{end}}">{{.ErrorMsg}}</div>
+ {{template "base/alert" .}}
<div class="form-group">
<label class="col-md-2 control-label">Owner<strong class="text-danger">*</strong></label>
<div class="col-md-8">
<form action="/repo/create" method="post" class="form-horizontal card" id="repo-create">
{{.CsrfTokenHtml}}
<h3>Create Repository Mirror</h3>
- <div class="alert alert-danger form-error{{if .HasError}}{{else}} hidden{{end}}">{{.ErrorMsg}}</div>
+ {{template "base/alert" .}}
<div class="form-group">
<label class="col-md-2 control-label">From<strong class="text-danger">*</strong></label>
<div class="col-md-8">
{{template "base/head" .}}
{{template "base/navbar" .}}
<div id="body" class="container" data-page="user">
- <div id="user-setting-nav" class="col-md-3">
- <h4>Account Setting</h4>
- <ul class="list-group">
- <li class="list-group-item"><a href="/user/setting">Account Profile</a></li>
- <li class="list-group-item"><a href="/user/setting/password">Password</a></li>
- <!-- <li class="list-group-item"><a href="/user/setting/notification">Notifications</a></li> -->
- <li class="list-group-item"><a href="/user/setting/ssh/">SSH Keys</a></li>
- <!-- <li class="list-group-item"><a href="/user/setting/security">Security</a></li> -->
- <li class="list-group-item list-group-item-success"><a href="/user/delete">Delete Account</a></li>
- </ul>
- </div>
-
+ {{template "user/setting_nav" .}}
<div id="user-setting-container" class="col-md-9">
<h4>Delete Account</h4>
{{template "base/alert" .}}
<div id="setting-pwd">
<h4>Password</h4>
<form class="form-horizontal" id="password-form" method="post" action="/user/setting/password">
- {{.CsrfTokenHtml}}
- {{if .IsSuccess}}
- <p class="alert alert-success">Password is changed successfully. You can now sign in via new password.</p>{{else if .HasError}}<p class="alert alert-danger form-error">{{.ErrorMsg}}</p>{{end}}
+ {{.CsrfTokenHtml}}
+ {{template "base/alert" .}}
<div class="form-group">
<label class="col-md-3 control-label">Old Password<strong class="text-danger">*</strong></label>
<div class="col-md-7">
<div class="form-group">
<div class="col-md-offset-3 col-md-7">
<button type="submit" class="btn btn-primary">Change Password</button>
- <a href="/forget-password/">Forgot your password?</a>
+ <a href="/user/forget_password/">Forgot your password?</a>
</div>
</div>
</form>
r.Get("/login/github", user.SocialSignIn)
r.Get("/sign_up", user.SignUp)
r.Post("/sign_up", bindIgnErr(auth.RegisterForm{}), user.SignUpPost)
- r.Get("/forget_password", user.ForgotPasswd)
- r.Post("/forget_password", user.ForgotPasswdPost)
r.Get("/reset_password", user.ResetPasswd)
r.Post("/reset_password", user.ResetPasswdPost)
}, reqSignOut)
m.Group("/user", func(r martini.Router) {
r.Get("/feeds", binding.Bind(auth.FeedsForm{}), user.Feeds)
r.Get("/activate", user.Activate)
+ r.Get("/forget_password", user.ForgotPasswd)
+ r.Post("/forget_password", user.ForgotPasswdPost)
})
m.Group("/user/setting", func(r martini.Router) {
- r.Any("/password", bindIgnErr(auth.UpdatePasswdForm{}), user.SettingPassword)
+ r.Get("/password", user.SettingPassword)
+ r.Post("/password", bindIgnErr(auth.UpdatePasswdForm{}), user.SettingPasswordPost)
r.Any("/ssh", bindIgnErr(auth.AddSSHKeyForm{}), user.SettingSSHKeys)
- r.Any("/notification", user.SettingNotification)
- r.Any("/security", user.SettingSecurity)
+ r.Get("/notification", user.SettingNotification)
+ r.Get("/security", user.SettingSecurity)
}, reqSignIn)
m.Get("/user/:username", ignSignIn, user.Profile)
- m.Any("/repo/create", reqSignIn, bindIgnErr(auth.CreateRepoForm{}), repo.Create)
- m.Any("/repo/mirror", reqSignIn, bindIgnErr(auth.CreateRepoForm{}), repo.Mirror)
+ m.Group("/repo", func(r martini.Router) {
+ m.Get("/create", repo.Create)
+ m.Post("/create", bindIgnErr(auth.CreateRepoForm{}), repo.CreatePost)
+ m.Get("/mirror", repo.Mirror)
+ m.Post("/mirror", bindIgnErr(auth.CreateRepoForm{}), repo.MirrorPost)
+ }, reqSignIn)
adminReq := middleware.Toggle(&middleware.ToggleOptions{SignInRequire: true, AdminRequire: true})
r.Get("/config", admin.Config)
}, adminReq)
m.Group("/admin/users", func(r martini.Router) {
- r.Any("/new", bindIgnErr(auth.RegisterForm{}), admin.NewUser)
- r.Any("/:userid", bindIgnErr(auth.AdminEditUserForm{}), admin.EditUser)
- r.Any("/:userid/delete", admin.DeleteUser)
+ r.Get("/new", admin.NewUser)
+ r.Post("/new", bindIgnErr(auth.RegisterForm{}), admin.NewUserPost)
+ r.Get("/:userid", admin.EditUser)
+ r.Post("/:userid", bindIgnErr(auth.AdminEditUserForm{}), admin.EditUserPost)
+ r.Get("/:userid/delete", admin.DeleteUser)
}, adminReq)
if martini.Env == martini.Dev {
r.Post("/settings", repo.SettingPost)
r.Get("/settings", repo.Setting)
r.Get("/action/:action", repo.Action)
- r.Any("/issues/new", bindIgnErr(auth.CreateIssueForm{}), repo.CreateIssue)
+ r.Get("/issues/new", repo.CreateIssue)
+ r.Post("/issues/new", bindIgnErr(auth.CreateIssueForm{}), repo.CreateIssuePost)
r.Post("/issues/:index", bindIgnErr(auth.CreateIssueForm{}), repo.UpdateIssue)
r.Post("/comment/:action", repo.Comment)
}, reqSignIn, middleware.RepoAssignment(true))
r.Get("/issues", repo.Issues)
r.Get("/issues/:index", repo.ViewIssue)
r.Get("/releases", repo.Releases)
- r.Any("/releases/new", repo.ReleasesNew)
+ r.Any("/releases/new", repo.ReleasesNew) // TODO:
r.Get("/pulls", repo.Pulls)
r.Get("/branches", repo.Branches)
}, ignSignIn, middleware.RepoAssignment(true))
projects / gitea.git / commitdiff