From af552596cfd7f6fd05dfc38abaaffad1d7fed654 Mon Sep 17 00:00:00 2001
From: Unknown <joe2010xtmf@163.com>
Date: Thu, 10 Apr 2014 14:37:43 -0400
Subject: [PATCH 1/4] Work on form resubmit
---
gogs.go | 2 +-
modules/middleware/context.go | 36 ++++++++++++++++-
routers/install.go | 76 ++++++++++++++++++++---------------
templates/base/alert.tmpl | 1 +
templates/install.tmpl | 2 +-
web.go | 5 ++-
6 files changed, 85 insertions(+), 37 deletions(-)
create mode 100644 templates/base/alert.tmpl
diff --git a/gogs.go b/gogs.go
index 2971007154..228fe89f40 100644
--- a/gogs.go
+++ b/gogs.go
@@ -19,7 +19,7 @@ import (
// Test that go1.2 tag above is included in builds. main.go refers to this definition.
const go12tag = true
-const APP_VER = "0.2.3.0409 Alpha"
+const APP_VER = "0.2.3.0410 Alpha"
func init() {
base.AppVer = APP_VER
diff --git a/modules/middleware/context.go b/modules/middleware/context.go
index 8129b13b7e..272af33052 100644
--- a/modules/middleware/context.go
+++ b/modules/middleware/context.go
@@ -11,6 +11,7 @@ import (
"fmt"
"html/template"
"net/http"
+ "net/url"
"strconv"
"strings"
"time"
@@ -34,6 +35,7 @@ type Context struct {
p martini.Params
Req *http.Request
Res http.ResponseWriter
+ Flash *Flash
Session session.SessionStore
Cache cache.Cache
User *models.User
@@ -78,6 +80,7 @@ func (ctx *Context) HasError() bool {
if !ok {
return false
}
+ ctx.Flash.Error(ctx.Data["ErrorMsg"].(string))
return hasErr.(bool)
}
@@ -88,8 +91,7 @@ func (ctx *Context) HTML(status int, name string, htmlOpt ...HTMLOptions) {
// RenderWithErr used for page has form validation but need to prompt error to users.
func (ctx *Context) RenderWithErr(msg, tpl string, form auth.Form) {
- ctx.Data["HasError"] = true
- ctx.Data["ErrorMsg"] = msg
+ ctx.Flash.Error(msg)
if form != nil {
auth.AssignForm(form, ctx.Data)
}
@@ -239,6 +241,21 @@ func (ctx *Context) CsrfTokenValid() bool {
return true
}
+type Flash struct {
+ url.Values
+ ErrorMsg, SuccessMsg string
+}
+
+func (f *Flash) Error(msg string) {
+ f.Set("error", msg)
+ f.ErrorMsg = msg
+}
+
+func (f *Flash) Success(msg string) {
+ f.Set("success", msg)
+ f.SuccessMsg = msg
+}
+
// InitContext initializes a classic context for a request.
func InitContext() martini.Handler {
return func(res http.ResponseWriter, r *http.Request, c martini.Context, rd *Render) {
@@ -256,9 +273,24 @@ func InitContext() martini.Handler {
// start session
ctx.Session = base.SessionManager.SessionStart(res, r)
+
+ ctx.Flash = &Flash{}
+ // Get flash.
+ values, err := url.ParseQuery(ctx.GetCookie("gogs_flash"))
+ if err != nil {
+ log.Error("InitContext.ParseQuery(flash): %v", err)
+ } else {
+ ctx.Flash.Values = values
+ ctx.Data["Flash"] = ctx.Flash
+ }
+
rw := res.(martini.ResponseWriter)
rw.Before(func(martini.ResponseWriter) {
ctx.Session.SessionRelease(res)
+
+ if flash := ctx.Flash.Encode(); len(flash) > 0 {
+ ctx.SetCookie("gogs_flash", ctx.Flash.Encode(), -1)
+ }
})
// Get user from session if logined.
diff --git a/routers/install.go b/routers/install.go
index 5d6c65ef9b..d3686053b1 100644
--- a/routers/install.go
+++ b/routers/install.go
@@ -23,6 +23,10 @@ import (
"github.com/gogits/gogs/modules/middleware"
)
+type installRouter int
+
+var InstallRouter installRouter = 1
+
// Check run mode(Default of martini is Dev).
func checkRunMode() {
switch base.Cfg.MustValue("", "RUN_MODE") {
@@ -54,7 +58,7 @@ func GlobalInit() {
checkRunMode()
}
-func Install(ctx *middleware.Context, form auth.InstallForm) {
+func (r installRouter) Get(ctx *middleware.Context, form auth.InstallForm) {
if base.InstallLock {
ctx.Handle(404, "install.Install", errors.New("Installation is prohibited"))
return
@@ -63,42 +67,49 @@ func Install(ctx *middleware.Context, form auth.InstallForm) {
ctx.Data["Title"] = "Install"
ctx.Data["PageIsInstall"] = true
- if ctx.Req.Method == "GET" {
- // Get and assign value to install form.
- if len(form.Host) == 0 {
- form.Host = models.DbCfg.Host
- }
- if len(form.User) == 0 {
- form.User = models.DbCfg.User
- }
- if len(form.Passwd) == 0 {
- form.Passwd = models.DbCfg.Pwd
- }
- if len(form.DatabaseName) == 0 {
- form.DatabaseName = models.DbCfg.Name
- }
- if len(form.DatabasePath) == 0 {
- form.DatabasePath = models.DbCfg.Path
- }
+ // Get and assign value to install form.
+ if len(form.Host) == 0 {
+ form.Host = models.DbCfg.Host
+ }
+ if len(form.User) == 0 {
+ form.User = models.DbCfg.User
+ }
+ if len(form.Passwd) == 0 {
+ form.Passwd = models.DbCfg.Pwd
+ }
+ if len(form.DatabaseName) == 0 {
+ form.DatabaseName = models.DbCfg.Name
+ }
+ if len(form.DatabasePath) == 0 {
+ form.DatabasePath = models.DbCfg.Path
+ }
- if len(form.RepoRootPath) == 0 {
- form.RepoRootPath = base.RepoRootPath
- }
- if len(form.RunUser) == 0 {
- form.RunUser = base.RunUser
- }
- if len(form.Domain) == 0 {
- form.Domain = base.Domain
- }
- if len(form.AppUrl) == 0 {
- form.AppUrl = base.AppUrl
- }
+ if len(form.RepoRootPath) == 0 {
+ form.RepoRootPath = base.RepoRootPath
+ }
+ if len(form.RunUser) == 0 {
+ form.RunUser = base.RunUser
+ }
+ if len(form.Domain) == 0 {
+ form.Domain = base.Domain
+ }
+ if len(form.AppUrl) == 0 {
+ form.AppUrl = base.AppUrl
+ }
- auth.AssignForm(form, ctx.Data)
- ctx.HTML(200, "install")
+ auth.AssignForm(form, ctx.Data)
+ ctx.HTML(200, "install")
+}
+
+func (r installRouter) Post(ctx *middleware.Context, form auth.InstallForm) {
+ if base.InstallLock {
+ ctx.Handle(404, "install.Install", errors.New("Installation is prohibited"))
return
}
+ ctx.Data["Title"] = "Install"
+ ctx.Data["PageIsInstall"] = true
+
if ctx.HasError() {
ctx.HTML(200, "install")
return
@@ -197,5 +208,6 @@ func Install(ctx *middleware.Context, form auth.InstallForm) {
}
log.Info("First-time run install finished!")
+ ctx.Flash.Success("Welcome! We're glad that you choose Gogs, have fun and take care.")
ctx.Redirect("/user/login")
}
diff --git a/templates/base/alert.tmpl b/templates/base/alert.tmpl
new file mode 100644
index 0000000000..699314ace7
--- /dev/null
+++ b/templates/base/alert.tmpl
@@ -0,0 +1 @@
+{{if .Flash.ErrorMsg}}<div class="alert alert-danger form-error">{{.Flash.ErrorMsg}}</div>{{end}}
\ No newline at end of file
diff --git a/templates/install.tmpl b/templates/install.tmpl
index c70cfa3e6b..3aa64ccd4b 100644
--- a/templates/install.tmpl
+++ b/templates/install.tmpl
@@ -3,7 +3,7 @@
<form action="/install" method="post" class="form-horizontal card" id="install-card">
{{.CsrfTokenHtml}}
<h3>Install Steps For First-time Run</h3>
- <div class="alert alert-danger form-error{{if .HasError}}{{else}} hidden{{end}}">{{.ErrorMsg}}</div>
+ {{template "base/alert" .}}
<p class="help-block text-center">Gogs requires MySQL or PostgreSQL, SQLite3 only available for official binary version</p>
<div class="form-group">
<label class="col-md-3 control-label">Database Type: </label>
diff --git a/web.go b/web.go
index 1a9c292f3e..0f61bc2147 100644
--- a/web.go
+++ b/web.go
@@ -74,9 +74,12 @@ func runWeb(*cli.Context) {
ignSignIn := middleware.Toggle(&middleware.ToggleOptions{SignInRequire: base.Service.RequireSignInView})
reqSignOut := middleware.Toggle(&middleware.ToggleOptions{SignOutRequire: true})
+ bindIgnErr := binding.BindIgnErr
+
// Routers.
m.Get("/", ignSignIn, routers.Home)
- m.Any("/install", binding.BindIgnErr(auth.InstallForm{}), routers.Install)
+ m.Get("/install", bindIgnErr(auth.InstallForm{}), routers.InstallRouter.Get)
+ m.Post("/install", bindIgnErr(auth.InstallForm{}), routers.InstallRouter.Post)
m.Get("/issues", reqSignIn, user.Issues)
m.Get("/pulls", reqSignIn, user.Pulls)
m.Get("/stars", reqSignIn, user.Stars)
From 45462662e9bdb001f1cf3d4ca0e4d679757c7642 Mon Sep 17 00:00:00 2001
From: Unknown <joe2010xtmf@163.com>
Date: Thu, 10 Apr 2014 16:36:50 -0400
Subject: [PATCH 2/4] Add flash
---
gogs.go | 2 +-
models/git.go | 8 +-
modules/log/log.go | 1 +
modules/middleware/context.go | 14 ++-
routers/install.go | 8 +-
routers/user/setting.go | 24 ++--
routers/user/social.go | 7 +-
routers/user/user.go | 179 ++++++++++++++++++------------
templates/base/alert.tmpl | 3 +-
templates/status/500.tmpl | 4 +-
templates/user/delete.tmpl | 5 +-
templates/user/forgot_passwd.tmpl | 2 +-
templates/user/reset_passwd.tmpl | 2 +-
templates/user/setting.tmpl | 2 +-
templates/user/signin.tmpl | 2 +-
templates/user/signup.tmpl | 2 +-
web.go | 43 +++----
17 files changed, 179 insertions(+), 129 deletions(-)
diff --git a/gogs.go b/gogs.go
index 228fe89f40..72c506aff2 100644
--- a/gogs.go
+++ b/gogs.go
@@ -19,7 +19,7 @@ import (
// Test that go1.2 tag above is included in builds. main.go refers to this definition.
const go12tag = true
-const APP_VER = "0.2.3.0410 Alpha"
+const APP_VER = "0.2.4.0410 Alpha"
func init() {
base.AppVer = APP_VER
diff --git a/models/git.go b/models/git.go
index 77b7ef2d7e..68e139056a 100644
--- a/models/git.go
+++ b/models/git.go
@@ -14,6 +14,8 @@ import (
"path"
"strings"
+ "github.com/Unknwon/com"
+
"github.com/gogits/git"
"github.com/gogits/gogs/modules/base"
@@ -163,13 +165,11 @@ func getReposFiles(userName, repoName, commitId string, rpath string) ([]*RepoFi
return 0
}
- cmd := exec.Command("git", "log", "-1", "--pretty=format:%H", commitId, "--", path.Join(dirname, entry.Name))
- cmd.Dir = repopath
- out, err := cmd.Output()
+ stdout, _, err := com.ExecCmdDir(repopath, "git", "log", "-1", "--pretty=format:%H", commitId, "--", path.Join(dirname, entry.Name))
if err != nil {
return 0
}
- filecm, err := repo.GetCommit(string(out))
+ filecm, err := repo.GetCommit(string(stdout))
if err != nil {
return 0
}
diff --git a/modules/log/log.go b/modules/log/log.go
index f21897b901..636ea787ca 100644
--- a/modules/log/log.go
+++ b/modules/log/log.go
@@ -21,6 +21,7 @@ func init() {
func NewLogger(bufLen int64, mode, config string) {
Mode, Config = mode, config
logger = logs.NewLogger(bufLen)
+ logger.SetLogFuncCallDepth(3)
logger.SetLogger(mode, config)
}
diff --git a/modules/middleware/context.go b/modules/middleware/context.go
index 272af33052..6ee94b960b 100644
--- a/modules/middleware/context.go
+++ b/modules/middleware/context.go
@@ -91,10 +91,11 @@ func (ctx *Context) HTML(status int, name string, htmlOpt ...HTMLOptions) {
// RenderWithErr used for page has form validation but need to prompt error to users.
func (ctx *Context) RenderWithErr(msg, tpl string, form auth.Form) {
- ctx.Flash.Error(msg)
if form != nil {
auth.AssignForm(form, ctx.Data)
}
+ ctx.Flash.ErrorMsg = msg
+ ctx.Data["Flash"] = ctx.Flash
ctx.HTML(200, tpl)
}
@@ -274,22 +275,25 @@ func InitContext() martini.Handler {
// start session
ctx.Session = base.SessionManager.SessionStart(res, r)
- ctx.Flash = &Flash{}
// Get flash.
values, err := url.ParseQuery(ctx.GetCookie("gogs_flash"))
if err != nil {
log.Error("InitContext.ParseQuery(flash): %v", err)
- } else {
- ctx.Flash.Values = values
+ } else if len(values) > 0 {
+ ctx.Flash = &Flash{Values: values}
+ ctx.Flash.ErrorMsg = ctx.Flash.Get("error")
+ ctx.Flash.SuccessMsg = ctx.Flash.Get("success")
ctx.Data["Flash"] = ctx.Flash
+ ctx.SetCookie("gogs_flash", "", -1)
}
+ ctx.Flash = &Flash{Values: url.Values{}}
rw := res.(martini.ResponseWriter)
rw.Before(func(martini.ResponseWriter) {
ctx.Session.SessionRelease(res)
if flash := ctx.Flash.Encode(); len(flash) > 0 {
- ctx.SetCookie("gogs_flash", ctx.Flash.Encode(), -1)
+ ctx.SetCookie("gogs_flash", ctx.Flash.Encode(), 0)
}
})
diff --git a/routers/install.go b/routers/install.go
index d3686053b1..78ba383dee 100644
--- a/routers/install.go
+++ b/routers/install.go
@@ -23,10 +23,6 @@ import (
"github.com/gogits/gogs/modules/middleware"
)
-type installRouter int
-
-var InstallRouter installRouter = 1
-
// Check run mode(Default of martini is Dev).
func checkRunMode() {
switch base.Cfg.MustValue("", "RUN_MODE") {
@@ -58,7 +54,7 @@ func GlobalInit() {
checkRunMode()
}
-func (r installRouter) Get(ctx *middleware.Context, form auth.InstallForm) {
+func Install(ctx *middleware.Context, form auth.InstallForm) {
if base.InstallLock {
ctx.Handle(404, "install.Install", errors.New("Installation is prohibited"))
return
@@ -101,7 +97,7 @@ func (r installRouter) Get(ctx *middleware.Context, form auth.InstallForm) {
ctx.HTML(200, "install")
}
-func (r installRouter) Post(ctx *middleware.Context, form auth.InstallForm) {
+func InstallPost(ctx *middleware.Context, form auth.InstallForm) {
if base.InstallLock {
ctx.Handle(404, "install.Install", errors.New("Installation is prohibited"))
return
diff --git a/routers/user/setting.go b/routers/user/setting.go
index ea779e8549..03da04b9e3 100644
--- a/routers/user/setting.go
+++ b/routers/user/setting.go
@@ -14,8 +14,16 @@ import (
"github.com/gogits/gogs/modules/middleware"
)
+func Setting(ctx *middleware.Context) {
+ ctx.Data["Title"] = "Setting"
+ ctx.Data["PageIsUserSetting"] = true
+ ctx.Data["IsUserPageSetting"] = true
+ ctx.Data["Owner"] = ctx.User
+ ctx.HTML(200, "user/setting")
+}
+
// Render user setting page (email, website modify)
-func Setting(ctx *middleware.Context, form auth.UpdateProfileForm) {
+func SettingPost(ctx *middleware.Context, form auth.UpdateProfileForm) {
ctx.Data["Title"] = "Setting"
ctx.Data["PageIsUserSetting"] = true // For navbar arrow.
ctx.Data["IsUserPageSetting"] = true // For setting nav highlight.
@@ -23,7 +31,7 @@ func Setting(ctx *middleware.Context, form auth.UpdateProfileForm) {
user := ctx.User
ctx.Data["Owner"] = user
- if ctx.Req.Method == "GET" || ctx.HasError() {
+ if ctx.HasError() {
ctx.HTML(200, "user/setting")
return
}
@@ -32,13 +40,13 @@ func Setting(ctx *middleware.Context, form auth.UpdateProfileForm) {
if user.Name != form.UserName {
isExist, err := models.IsUserExist(form.UserName)
if err != nil {
- ctx.Handle(404, "user.Setting(update: check existence)", err)
+ ctx.Handle(500, "user.Setting(update: check existence)", err)
return
} else if isExist {
ctx.RenderWithErr("User name has been taken.", "user/setting", &form)
return
} else if err = models.ChangeUserName(user, form.UserName); err != nil {
- ctx.Handle(404, "user.Setting(change user name)", err)
+ ctx.Handle(500, "user.Setting(change user name)", err)
return
}
log.Trace("%s User name changed: %s -> %s", ctx.Req.RequestURI, user.Name, form.UserName)
@@ -52,13 +60,13 @@ func Setting(ctx *middleware.Context, form auth.UpdateProfileForm) {
user.Avatar = base.EncodeMd5(form.Avatar)
user.AvatarEmail = form.Avatar
if err := models.UpdateUser(user); err != nil {
- ctx.Handle(200, "setting.Setting", err)
+ ctx.Handle(500, "setting.Setting", err)
return
}
-
- ctx.Data["IsSuccess"] = true
- ctx.HTML(200, "user/setting")
log.Trace("%s User setting updated: %s", ctx.Req.RequestURI, ctx.User.LowerName)
+
+ ctx.Flash.Success("Your profile has been successfully updated.")
+ ctx.Redirect("/user/setting")
}
func SettingPassword(ctx *middleware.Context, form auth.UpdatePasswdForm) {
diff --git a/routers/user/social.go b/routers/user/social.go
index b87c313f5d..2b60ab9ffd 100644
--- a/routers/user/social.go
+++ b/routers/user/social.go
@@ -93,11 +93,10 @@ func SocialSignIn(ctx *middleware.Context, tokens oauth2.Tokens) {
log.Info("login soc id: %v", socid)
return
}
+
config := &oauth.Config{
- //ClientId: base.OauthService.Github.ClientId,
- //ClientSecret: base.OauthService.Github.ClientSecret, // FIXME: I don't know why compile error here
- ClientId: "09383403ff2dc16daaa1",
- ClientSecret: "0e4aa0c3630df396cdcea01a9d45cacf79925fea",
+ ClientId: base.OauthService.GitHub.ClientId,
+ ClientSecret: base.OauthService.GitHub.ClientSecret,
RedirectURL: strings.TrimSuffix(base.AppUrl, "/") + ctx.Req.URL.RequestURI(),
Scope: base.OauthService.GitHub.Scopes,
AuthURL: "https://github.com/login/oauth/authorize",
diff --git a/routers/user/user.go b/routers/user/user.go
index 084d0bbde2..37c6baa9f2 100644
--- a/routers/user/user.go
+++ b/routers/user/user.go
@@ -74,57 +74,63 @@ func Profile(ctx *middleware.Context, params martini.Params) {
ctx.HTML(200, "user/profile")
}
-func SignIn(ctx *middleware.Context, form auth.LogInForm) {
+func SignIn(ctx *middleware.Context) {
ctx.Data["Title"] = "Log In"
- if ctx.Req.Method == "GET" {
- if base.OauthService != nil {
- ctx.Data["OauthEnabled"] = true
- ctx.Data["OauthGitHubEnabled"] = base.OauthService.GitHub.Enabled
- }
+ if base.OauthService != nil {
+ ctx.Data["OauthEnabled"] = true
+ ctx.Data["OauthGitHubEnabled"] = base.OauthService.GitHub.Enabled
+ }
- // Check auto-login.
- userName := ctx.GetCookie(base.CookieUserName)
- if len(userName) == 0 {
- ctx.HTML(200, "user/signin")
- return
- }
-
- isSucceed := false
- defer func() {
- if !isSucceed {
- log.Trace("%s auto-login cookie cleared: %s", ctx.Req.RequestURI, userName)
- ctx.SetCookie(base.CookieUserName, "", -1)
- ctx.SetCookie(base.CookieRememberName, "", -1)
- }
- }()
-
- user, err := models.GetUserByName(userName)
- if err != nil {
- ctx.HTML(200, "user/signin")
- return
- }
-
- secret := base.EncodeMd5(user.Rands + user.Passwd)
- value, _ := ctx.GetSecureCookie(secret, base.CookieRememberName)
- if value != user.Name {
- ctx.HTML(200, "user/signin")
- return
- }
-
- isSucceed = true
- ctx.Session.Set("userId", user.Id)
- ctx.Session.Set("userName", user.Name)
- redirectTo, _ := url.QueryUnescape(ctx.GetCookie("redirect_to"))
- if len(redirectTo) > 0 {
- ctx.SetCookie("redirect_to", "", -1)
- ctx.Redirect(redirectTo)
- } else {
- ctx.Redirect("/")
- }
+ // Check auto-login.
+ userName := ctx.GetCookie(base.CookieUserName)
+ if len(userName) == 0 {
+ ctx.HTML(200, "user/signin")
return
}
+ isSucceed := false
+ defer func() {
+ if !isSucceed {
+ log.Trace("%s auto-login cookie cleared: %s", ctx.Req.RequestURI, userName)
+ ctx.SetCookie(base.CookieUserName, "", -1)
+ ctx.SetCookie(base.CookieRememberName, "", -1)
+ }
+ }()
+
+ user, err := models.GetUserByName(userName)
+ if err != nil {
+ ctx.HTML(200, "user/signin")
+ return
+ }
+
+ secret := base.EncodeMd5(user.Rands + user.Passwd)
+ value, _ := ctx.GetSecureCookie(secret, base.CookieRememberName)
+ if value != user.Name {
+ ctx.HTML(200, "user/signin")
+ return
+ }
+
+ isSucceed = true
+ ctx.Session.Set("userId", user.Id)
+ ctx.Session.Set("userName", user.Name)
+ if redirectTo, _ := url.QueryUnescape(ctx.GetCookie("redirect_to")); len(redirectTo) > 0 {
+ ctx.SetCookie("redirect_to", "", -1)
+ ctx.Redirect(redirectTo)
+ return
+ }
+
+ ctx.Redirect("/")
+}
+
+func SignInPost(ctx *middleware.Context, form auth.LogInForm) {
+ ctx.Data["Title"] = "Log In"
+
+ if base.OauthService != nil {
+ ctx.Data["OauthEnabled"] = true
+ ctx.Data["OauthGitHubEnabled"] = base.OauthService.GitHub.Enabled
+ }
+
if ctx.HasError() {
ctx.HTML(200, "user/signin")
return
@@ -138,7 +144,7 @@ func SignIn(ctx *middleware.Context, form auth.LogInForm) {
return
}
- ctx.Handle(200, "user.SignIn", err)
+ ctx.Handle(500, "user.SignIn", err)
return
}
@@ -151,13 +157,13 @@ func SignIn(ctx *middleware.Context, form auth.LogInForm) {
ctx.Session.Set("userId", user.Id)
ctx.Session.Set("userName", user.Name)
- redirectTo, _ := url.QueryUnescape(ctx.GetCookie("redirect_to"))
- if len(redirectTo) > 0 {
+ if redirectTo, _ := url.QueryUnescape(ctx.GetCookie("redirect_to")); len(redirectTo) > 0 {
ctx.SetCookie("redirect_to", "", -1)
ctx.Redirect(redirectTo)
- } else {
- ctx.Redirect("/")
+ return
}
+
+ ctx.Redirect("/")
}
func SignOut(ctx *middleware.Context) {
@@ -168,7 +174,7 @@ func SignOut(ctx *middleware.Context) {
ctx.Redirect("/")
}
-func SignUp(ctx *middleware.Context, form auth.RegisterForm) {
+func SignUp(ctx *middleware.Context) {
ctx.Data["Title"] = "Sign Up"
ctx.Data["PageIsSignUp"] = true
@@ -178,8 +184,15 @@ func SignUp(ctx *middleware.Context, form auth.RegisterForm) {
return
}
- if ctx.Req.Method == "GET" {
- ctx.HTML(200, "user/signup")
+ ctx.HTML(200, "user/signup")
+}
+
+func SignUpPost(ctx *middleware.Context, form auth.RegisterForm) {
+ ctx.Data["Title"] = "Sign Up"
+ ctx.Data["PageIsSignUp"] = true
+
+ if base.Service.DisenableRegisteration {
+ ctx.Handle(403, "user.SignUpPost", nil)
return
}
@@ -213,7 +226,7 @@ func SignUp(ctx *middleware.Context, form auth.RegisterForm) {
case models.ErrUserNameIllegal:
ctx.RenderWithErr(models.ErrRepoNameIllegal.Error(), "user/signup", &form)
default:
- ctx.Handle(200, "user.SignUp", err)
+ ctx.Handle(500, "user.SignUp", err)
}
return
}
@@ -240,25 +253,28 @@ func Delete(ctx *middleware.Context) {
ctx.Data["Title"] = "Delete Account"
ctx.Data["PageIsUserSetting"] = true
ctx.Data["IsUserPageSettingDelete"] = true
+ ctx.HTML(200, "user/delete")
+}
- if ctx.Req.Method == "GET" {
- ctx.HTML(200, "user/delete")
- return
+func DeletePost(ctx *middleware.Context) {
+ ctx.Data["Title"] = "Delete Account"
+ ctx.Data["PageIsUserSetting"] = true
+ ctx.Data["IsUserPageSettingDelete"] = true
+
+ tmpUser := models.User{
+ Passwd: ctx.Query("password"),
+ Salt: ctx.User.Salt,
}
-
- tmpUser := models.User{Passwd: ctx.Query("password")}
tmpUser.EncodePasswd()
- if len(tmpUser.Passwd) == 0 || tmpUser.Passwd != ctx.User.Passwd {
- ctx.Data["HasError"] = true
- ctx.Data["ErrorMsg"] = "Password is not correct. Make sure you are owner of this account."
+ if tmpUser.Passwd != ctx.User.Passwd {
+ ctx.Flash.Error("Password is not correct. Make sure you are owner of this account.")
} else {
if err := models.DeleteUser(ctx.User); err != nil {
- ctx.Data["HasError"] = true
switch err {
case models.ErrUserOwnRepos:
- ctx.Data["ErrorMsg"] = "Your account still have ownership of repository, you have to delete or transfer them first."
+ ctx.Flash.Error("Your account still have ownership of repository, you have to delete or transfer them first.")
default:
- ctx.Handle(200, "user.Delete", err)
+ ctx.Handle(500, "user.Delete", err)
return
}
} else {
@@ -267,7 +283,7 @@ func Delete(ctx *middleware.Context) {
}
}
- ctx.HTML(200, "user/delete")
+ ctx.Redirect("/user/delete")
}
const (
@@ -439,10 +455,17 @@ func ForgotPasswd(ctx *middleware.Context) {
}
ctx.Data["IsResetRequest"] = true
- if ctx.Req.Method == "GET" {
- ctx.HTML(200, "user/forgot_passwd")
+ ctx.HTML(200, "user/forgot_passwd")
+}
+
+func ForgotPasswdPost(ctx *middleware.Context) {
+ ctx.Data["Title"] = "Forgot Password"
+
+ if base.MailService == nil {
+ ctx.Handle(403, "user.ForgotPasswdPost", nil)
return
}
+ ctx.Data["IsResetRequest"] = true
email := ctx.Query("email")
u, err := models.GetUserByEmail(email)
@@ -450,7 +473,7 @@ func ForgotPasswd(ctx *middleware.Context) {
if err == models.ErrUserNotExist {
ctx.RenderWithErr("This e-mail address does not associate to any account.", "user/forgot_passwd", nil)
} else {
- ctx.Handle(404, "user.ResetPasswd(check existence)", err)
+ ctx.Handle(500, "user.ResetPasswd(check existence)", err)
}
return
}
@@ -473,6 +496,8 @@ func ForgotPasswd(ctx *middleware.Context) {
}
func ResetPasswd(ctx *middleware.Context) {
+ ctx.Data["Title"] = "Reset Password"
+
code := ctx.Query("code")
if len(code) == 0 {
ctx.Error(404)
@@ -480,11 +505,19 @@ func ResetPasswd(ctx *middleware.Context) {
}
ctx.Data["Code"] = code
- if ctx.Req.Method == "GET" {
- ctx.Data["IsResetForm"] = true
- ctx.HTML(200, "user/reset_passwd")
+ ctx.Data["IsResetForm"] = true
+ ctx.HTML(200, "user/reset_passwd")
+}
+
+func ResetPasswdPost(ctx *middleware.Context) {
+ ctx.Data["Title"] = "Reset Password"
+
+ code := ctx.Query("code")
+ if len(code) == 0 {
+ ctx.Error(404)
return
}
+ ctx.Data["Code"] = code
if u := models.VerifyUserActiveCode(code); u != nil {
// Validate password length.
@@ -500,7 +533,7 @@ func ResetPasswd(ctx *middleware.Context) {
u.Salt = models.GetUserSalt()
u.EncodePasswd()
if err := models.UpdateUser(u); err != nil {
- ctx.Handle(404, "user.ResetPasswd(UpdateUser)", err)
+ ctx.Handle(500, "user.ResetPasswd(UpdateUser)", err)
return
}
diff --git a/templates/base/alert.tmpl b/templates/base/alert.tmpl
index 699314ace7..bb1eb6aab1 100644
--- a/templates/base/alert.tmpl
+++ b/templates/base/alert.tmpl
@@ -1 +1,2 @@
-{{if .Flash.ErrorMsg}}<div class="alert alert-danger form-error">{{.Flash.ErrorMsg}}</div>{{end}}
\ No newline at end of file
+{{if .Flash.ErrorMsg}}<div class="alert alert-danger form-error">{{.Flash.ErrorMsg}}</div>{{end}}
+{{if .Flash.SuccessMsg}}<div class="alert alert-success">{{.Flash.SuccessMsg}}</div>{{end}}
\ No newline at end of file
diff --git a/templates/status/500.tmpl b/templates/status/500.tmpl
index dd7358115d..07edd3620a 100644
--- a/templates/status/500.tmpl
+++ b/templates/status/500.tmpl
@@ -2,8 +2,8 @@
{{template "base/navbar" .}}
<div id="body" class="container text-center">
<p style="margin-top: 80px"><img src="/img/500.png" alt="404"/></p>
- <hr/>
- <p>An error is occurred : {{.ErrorMsg}}</p>
+ {{if .ErrorMsg}}<hr/>
+ <p>An error is occurred : {{.ErrorMsg}}</p>{{end}}
<hr/>
<p>Application Version: {{AppVer}}</p>
</div>
diff --git a/templates/user/delete.tmpl b/templates/user/delete.tmpl
index 17c9ea8925..39949ee2b6 100644
--- a/templates/user/delete.tmpl
+++ b/templates/user/delete.tmpl
@@ -12,13 +12,16 @@
<li class="list-group-item list-group-item-success"><a href="/user/delete">Delete Account</a></li>
</ul>
</div>
+
<div id="user-setting-container" class="col-md-9">
<h4>Delete Account</h4>
- <p class="alert alert-danger">{{if not .HasError}}The operation will delete your account permanently. Sorry to see you go, but we know you'll back soon.{{else}}{{.ErrorMsg}}{{end}}</p>
+ {{template "base/alert" .}}
+ {{if not .Flash.ErrorMsg}}<p class="alert alert-danger">The operation will delete your account permanently. Sorry to see you go, but we know you'll back soon.</p>{{end}}
<div class="form-group">
<button type="submit" class="btn btn-danger btn-lg" href="#delete-account-modal" id="delete-account" data-toggle="modal">Delete Account</button>
</div>
</div>
+
<div class="modal fade" id="delete-account-modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
<form action="/user/delete" method="post" class="modal-content" id="user-delete">
diff --git a/templates/user/forgot_passwd.tmpl b/templates/user/forgot_passwd.tmpl
index a099ff2744..7990ab18cd 100644
--- a/templates/user/forgot_passwd.tmpl
+++ b/templates/user/forgot_passwd.tmpl
@@ -4,7 +4,7 @@
<form action="/user/forget_password" method="post" class="form-horizontal card" id="login-card">
{{.CsrfTokenHtml}}
<h3>Reset Your Password</h3>
- <div class="alert alert-danger form-error{{if .HasError}}{{else}} hidden{{end}}">{{.ErrorMsg}}</div>
+ {{template "base/alert" .}}
{{if .IsResetSent}}
<p>A confirmation e-mail has been sent to <b>{{.Email}}</b>, please check your inbox within {{.Hours}} hours.</p>
<hr/>
diff --git a/templates/user/reset_passwd.tmpl b/templates/user/reset_passwd.tmpl
index 9190c7c13c..966b6cb3b5 100644
--- a/templates/user/reset_passwd.tmpl
+++ b/templates/user/reset_passwd.tmpl
@@ -4,7 +4,7 @@
<form action="/user/reset_password?code={{.Code}}" method="post" class="form-horizontal card" id="login-card">
{{.CsrfTokenHtml}}
<h3>Reset Your Pasword</h3>
- <div class="alert alert-danger form-error{{if .HasError}}{{else}} hidden{{end}}">{{.ErrorMsg}}</div>
+ {{template "base/alert" .}}
{{if .IsResetForm}}
<div class="form-group">
<label class="col-md-4 control-label">Password: </label>
diff --git a/templates/user/setting.tmpl b/templates/user/setting.tmpl
index d582833870..762dc33b7f 100644
--- a/templates/user/setting.tmpl
+++ b/templates/user/setting.tmpl
@@ -7,7 +7,7 @@
<h4>Account Profile</h4>
<form class="form-horizontal" id="password-form" method="post" action="/user/setting">
{{.CsrfTokenHtml}}
- {{if .IsSuccess}}<p class="alert alert-success">Your profile has been successfully updated.</p>{{else if .HasError}}<p class="alert alert-danger form-error">{{.ErrorMsg}}</p>{{end}}
+ {{template "base/alert" .}}
<p>Your Email will be public and used for Account related notifications and any web based operations made via the web.</p>
<div class="form-group">
<label class="col-md-2 control-label" for="user-setting-username">Username<strong class="text-danger">*</strong></label>
diff --git a/templates/user/signin.tmpl b/templates/user/signin.tmpl
index eb4cb9ccee..294c0d3418 100644
--- a/templates/user/signin.tmpl
+++ b/templates/user/signin.tmpl
@@ -4,7 +4,7 @@
<form action="/user/login" method="post" class="form-horizontal card" id="login-card">
{{.CsrfTokenHtml}}
<h3>Log in</h3>
- <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-4 control-label">Username: </label>
<div class="col-md-6">
diff --git a/templates/user/signup.tmpl b/templates/user/signup.tmpl
index 6ed595a350..87fa80ccc1 100644
--- a/templates/user/signup.tmpl
+++ b/templates/user/signup.tmpl
@@ -7,7 +7,7 @@
Sorry, registeration has been disenabled, you can only get account from administrator.
{{else}}
<h3>Sign Up</h3>
- <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-4 control-label">Username: </label>
<div class="col-md-6">
diff --git a/web.go b/web.go
index 962ad7445d..8af27038fe 100644
--- a/web.go
+++ b/web.go
@@ -83,8 +83,8 @@ func runWeb(*cli.Context) {
// Routers.
m.Get("/", ignSignIn, routers.Home)
- m.Get("/install", bindIgnErr(auth.InstallForm{}), routers.InstallRouter.Get)
- m.Post("/install", bindIgnErr(auth.InstallForm{}), routers.InstallRouter.Post)
+ m.Get("/install", bindIgnErr(auth.InstallForm{}), routers.Install)
+ m.Post("/install", bindIgnErr(auth.InstallForm{}), routers.InstallPost)
m.Get("/issues", reqSignIn, user.Issues)
m.Get("/pulls", reqSignIn, user.Pulls)
m.Get("/stars", reqSignIn, user.Stars)
@@ -98,33 +98,38 @@ func runWeb(*cli.Context) {
m.Get("/avatar/:hash", avt.ServeHTTP)
m.Group("/user", func(r martini.Router) {
- r.Any("/login", binding.BindIgnErr(auth.LogInForm{}), user.SignIn)
- r.Any("/login/github", user.SocialSignIn)
- r.Any("/sign_up", binding.BindIgnErr(auth.RegisterForm{}), user.SignUp)
- r.Any("/forget_password", user.ForgotPasswd)
- r.Any("/reset_password", user.ResetPasswd)
+ r.Get("/login", user.SignIn)
+ r.Post("/login", bindIgnErr(auth.LogInForm{}), user.SignInPost)
+ 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.Any("/logout", user.SignOut)
- r.Any("/delete", user.Delete)
- r.Any("/setting", binding.BindIgnErr(auth.UpdateProfileForm{}), user.Setting)
+ r.Get("/logout", user.SignOut)
+ r.Get("/delete", user.Delete)
+ r.Post("/delete", user.DeletePost)
+ r.Get("/setting", user.Setting)
+ r.Post("/setting", bindIgnErr(auth.UpdateProfileForm{}), user.SettingPost)
}, reqSignIn)
m.Group("/user", func(r martini.Router) {
r.Get("/feeds", binding.Bind(auth.FeedsForm{}), user.Feeds)
r.Get("/activate", user.Activate)
})
-
m.Group("/user/setting", func(r martini.Router) {
- r.Any("/password", binding.BindIgnErr(auth.UpdatePasswdForm{}), user.SettingPassword)
- r.Any("/ssh", binding.BindIgnErr(auth.AddSSHKeyForm{}), user.SettingSSHKeys)
+ r.Any("/password", bindIgnErr(auth.UpdatePasswdForm{}), user.SettingPassword)
+ r.Any("/ssh", bindIgnErr(auth.AddSSHKeyForm{}), user.SettingSSHKeys)
r.Any("/notification", user.SettingNotification)
r.Any("/security", user.SettingSecurity)
}, reqSignIn)
m.Get("/user/:username", ignSignIn, user.Profile)
- m.Any("/repo/create", reqSignIn, binding.BindIgnErr(auth.CreateRepoForm{}), repo.Create)
- m.Any("/repo/mirror", reqSignIn, binding.BindIgnErr(auth.CreateRepoForm{}), repo.Mirror)
+ m.Any("/repo/create", reqSignIn, bindIgnErr(auth.CreateRepoForm{}), repo.Create)
+ m.Any("/repo/mirror", reqSignIn, bindIgnErr(auth.CreateRepoForm{}), repo.Mirror)
adminReq := middleware.Toggle(&middleware.ToggleOptions{SignInRequire: true, AdminRequire: true})
@@ -135,8 +140,8 @@ func runWeb(*cli.Context) {
r.Get("/config", admin.Config)
}, adminReq)
m.Group("/admin/users", func(r martini.Router) {
- r.Any("/new", binding.BindIgnErr(auth.RegisterForm{}), admin.NewUser)
- r.Any("/:userid", binding.BindIgnErr(auth.AdminEditUserForm{}), admin.EditUser)
+ r.Any("/new", bindIgnErr(auth.RegisterForm{}), admin.NewUser)
+ r.Any("/:userid", bindIgnErr(auth.AdminEditUserForm{}), admin.EditUser)
r.Any("/:userid/delete", admin.DeleteUser)
}, adminReq)
@@ -148,8 +153,8 @@ func runWeb(*cli.Context) {
r.Post("/settings", repo.SettingPost)
r.Get("/settings", repo.Setting)
r.Get("/action/:action", repo.Action)
- r.Any("/issues/new", binding.BindIgnErr(auth.CreateIssueForm{}), repo.CreateIssue)
- r.Post("/issues/:index", binding.BindIgnErr(auth.CreateIssueForm{}), repo.UpdateIssue)
+ r.Any("/issues/new", bindIgnErr(auth.CreateIssueForm{}), repo.CreateIssue)
+ r.Post("/issues/:index", bindIgnErr(auth.CreateIssueForm{}), repo.UpdateIssue)
r.Post("/comment/:action", repo.Comment)
}, reqSignIn, middleware.RepoAssignment(true))
From 8980675a9f8f8328a81dde63174115c4a11f02a3 Mon Sep 17 00:00:00 2001
From: Unknown <joe2010xtmf@163.com>
Date: Thu, 10 Apr 2014 18:09:57 -0400
Subject: [PATCH 3/4] Fix #69
---
README.md | 2 +-
README_ZH.md | 2 +-
routers/admin/user.go | 66 +++++++++++++++++++--------------
routers/repo/issue.go | 22 ++++++-----
routers/repo/repo.go | 32 +++++++++-------
routers/user/setting.go | 38 +++++++++++--------
templates/admin/users/edit.tmpl | 2 +-
templates/admin/users/new.tmpl | 2 +-
templates/issue/create.tmpl | 1 +
templates/repo/create.tmpl | 2 +-
templates/repo/mirror.tmpl | 2 +-
templates/user/delete.tmpl | 13 +------
templates/user/password.tmpl | 7 ++--
web.go | 32 ++++++++++------
14 files changed, 123 insertions(+), 100 deletions(-)
diff --git a/README.md b/README.md
index 619f9a9dd6..42369868f1 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ Gogs(Go Git Service) is a Self Hosted Git Service in the Go Programming Language
-##### 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.
diff --git a/README_ZH.md b/README_ZH.md
index 35a0b7630d..71db29a6ed 100644
--- a/README_ZH.md
+++ b/README_ZH.md
@@ -5,7 +5,7 @@ Gogs(Go Git Service) 是一个由 Go 语言编写的自助 Git 托管服务。
-##### 当前版本：0.2.3 Alpha
+##### 当前版本：0.2.4 Alpha
## 开发目的
diff --git a/routers/admin/user.go b/routers/admin/user.go
index 9f043507d1..fee692202e 100644
--- a/routers/admin/user.go
+++ b/routers/admin/user.go
@@ -16,14 +16,15 @@ import (
"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
@@ -55,7 +56,7 @@ func NewUser(ctx *middleware.Context, form auth.RegisterForm) {
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
}
@@ -66,25 +67,39 @@ func NewUser(ctx *middleware.Context, form auth.RegisterForm) {
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
}
@@ -96,47 +111,44 @@ func EditUser(ctx *middleware.Context, params martini.Params, form auth.AdminEdi
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)
diff --git a/routers/repo/issue.go b/routers/repo/issue.go
index 9688fd4d94..9ab07c0d59 100644
--- a/routers/repo/issue.go
+++ b/routers/repo/issue.go
@@ -82,15 +82,17 @@ func Issues(ctx *middleware.Context) {
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")
@@ -100,7 +102,7 @@ func CreateIssue(ctx *middleware.Context, params martini.Params, form auth.Creat
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
}
@@ -108,7 +110,7 @@ func CreateIssue(ctx *middleware.Context, params martini.Params, form auth.Creat
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
}
@@ -116,7 +118,7 @@ func CreateIssue(ctx *middleware.Context, params martini.Params, form auth.Creat
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
}
@@ -132,12 +134,12 @@ func CreateIssue(ctx *middleware.Context, params martini.Params, form auth.Creat
}
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))
}
diff --git a/routers/repo/repo.go b/routers/repo/repo.go
index d4d52ba0d7..b2897d0f51 100644
--- a/routers/repo/repo.go
+++ b/routers/repo/repo.go
@@ -21,16 +21,19 @@ import (
"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")
@@ -50,17 +53,18 @@ func Create(ctx *middleware.Context, form auth.CreateRepoForm) {
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")
@@ -80,7 +84,7 @@ func Mirror(ctx *middleware.Context, form auth.CreateRepoForm) {
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) {
diff --git a/routers/user/setting.go b/routers/user/setting.go
index 03da04b9e3..7e66ad3599 100644
--- a/routers/user/setting.go
+++ b/routers/user/setting.go
@@ -69,38 +69,46 @@ func SettingPost(ctx *middleware.Context, form auth.UpdateProfileForm) {
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) {
diff --git a/templates/admin/users/edit.tmpl b/templates/admin/users/edit.tmpl
index 5db2c7a95e..da9a67cfae 100644
--- a/templates/admin/users/edit.tmpl
+++ b/templates/admin/users/edit.tmpl
@@ -11,8 +11,8 @@
<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>
diff --git a/templates/admin/users/new.tmpl b/templates/admin/users/new.tmpl
index 7f441f32b3..4c851e3144 100644
--- a/templates/admin/users/new.tmpl
+++ b/templates/admin/users/new.tmpl
@@ -12,7 +12,7 @@
<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">
diff --git a/templates/issue/create.tmpl b/templates/issue/create.tmpl
index 5375040b09..a75ee83617 100644
--- a/templates/issue/create.tmpl
+++ b/templates/issue/create.tmpl
@@ -6,6 +6,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>
diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl
index dc509fc1cc..97c7945616 100644
--- a/templates/repo/create.tmpl
+++ b/templates/repo/create.tmpl
@@ -4,7 +4,7 @@
<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">
diff --git a/templates/repo/mirror.tmpl b/templates/repo/mirror.tmpl
index 2ac21dd617..0f10d1f549 100644
--- a/templates/repo/mirror.tmpl
+++ b/templates/repo/mirror.tmpl
@@ -4,7 +4,7 @@
<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">
diff --git a/templates/user/delete.tmpl b/templates/user/delete.tmpl
index 39949ee2b6..6493bef38e 100644
--- a/templates/user/delete.tmpl
+++ b/templates/user/delete.tmpl
@@ -1,18 +1,7 @@
{{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" .}}
diff --git a/templates/user/password.tmpl b/templates/user/password.tmpl
index b2cdc72d9e..cba9cce0c5 100644
--- a/templates/user/password.tmpl
+++ b/templates/user/password.tmpl
@@ -6,9 +6,8 @@
<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">
@@ -33,7 +32,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>
diff --git a/web.go b/web.go
index 8af27038fe..b2be73d677 100644
--- a/web.go
+++ b/web.go
@@ -103,8 +103,6 @@ func runWeb(*cli.Context) {
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)
@@ -118,18 +116,25 @@ func runWeb(*cli.Context) {
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})
@@ -140,9 +145,11 @@ func runWeb(*cli.Context) {
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 {
@@ -153,7 +160,8 @@ func runWeb(*cli.Context) {
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))
@@ -162,7 +170,7 @@ func runWeb(*cli.Context) {
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))
From 306aa5bffe7868207ed7b773c1aedbf3f0a659ad Mon Sep 17 00:00:00 2001
From: Unknown <joe2010xtmf@163.com>
Date: Thu, 10 Apr 2014 22:03:31 -0400
Subject: [PATCH 4/4] Add support default branch
---
models/repo.go | 1 +
modules/middleware/repo.go | 10 +++++++---
routers/repo/repo.go | 29 +++++++++++++----------------
templates/install.tmpl | 4 ----
templates/repo/diff.tmpl | 8 ++++++++
templates/repo/setting.tmpl | 11 +++++++----
6 files changed, 36 insertions(+), 27 deletions(-)
diff --git a/models/repo.go b/models/repo.go
index 573e0f4e6f..91dc710281 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -80,6 +80,7 @@ type Repository struct {
IsPrivate bool
IsBare bool
IsGoget bool
+ DefaultBranch string
Created time.Time `xorm:"created"`
Updated time.Time `xorm:"updated"`
}
diff --git a/modules/middleware/repo.go b/modules/middleware/repo.go
index 2139742c70..ae9f04b113 100644
--- a/modules/middleware/repo.go
+++ b/modules/middleware/repo.go
@@ -76,7 +76,7 @@ func RepoAssignment(redirect bool, args ...bool) martini.Handler {
ctx.Redirect("/")
return
}
- ctx.Handle(404, "RepoAssignment", err)
+ ctx.Handle(500, "RepoAssignment", err)
return
}
repo.NumOpenIssues = repo.NumIssues - repo.NumClosedIssues
@@ -86,7 +86,7 @@ func RepoAssignment(redirect bool, args ...bool) martini.Handler {
gitRepo, err := git.OpenRepository(models.RepoPath(userName, repoName))
if err != nil {
- ctx.Handle(404, "RepoAssignment Invalid repo "+models.RepoPath(userName, repoName), err)
+ ctx.Handle(500, "RepoAssignment Invalid repo "+models.RepoPath(userName, repoName), err)
return
}
ctx.Repo.GitRepo = gitRepo
@@ -138,7 +138,10 @@ func RepoAssignment(redirect bool, args ...bool) martini.Handler {
}
} else {
- branchName = "master"
+ branchName = ctx.Repo.Repository.DefaultBranch
+ if len(branchName) == 0 {
+ branchName = "master"
+ }
goto detect
}
@@ -157,6 +160,7 @@ func RepoAssignment(redirect bool, args ...bool) martini.Handler {
}
ctx.Data["BranchName"] = ctx.Repo.BranchName
+ ctx.Data["Branches"], _ = models.GetBranches(ctx.User.Name, ctx.Repo.Repository.Name)
ctx.Data["CommitId"] = ctx.Repo.CommitId
ctx.Data["IsRepositoryWatching"] = ctx.Repo.IsWatching
}
diff --git a/routers/repo/repo.go b/routers/repo/repo.go
index b2897d0f51..1ae4a3740a 100644
--- a/routers/repo/repo.go
+++ b/routers/repo/repo.go
@@ -323,27 +323,29 @@ func SettingPost(ctx *middleware.Context) {
switch ctx.Query("action") {
case "update":
- isNameChanged := false
newRepoName := ctx.Query("name")
// Check if repository name has been changed.
if ctx.Repo.Repository.Name != newRepoName {
isExist, err := models.IsRepositoryExist(ctx.Repo.Owner, newRepoName)
if err != nil {
- ctx.Handle(404, "repo.SettingPost(update: check existence)", err)
+ ctx.Handle(500, "repo.SettingPost(update: check existence)", err)
return
} else if isExist {
ctx.RenderWithErr("Repository name has been taken in your repositories.", "repo/setting", nil)
return
} else if err = models.ChangeRepositoryName(ctx.Repo.Owner.Name, ctx.Repo.Repository.Name, newRepoName); err != nil {
- ctx.Handle(404, "repo.SettingPost(change repository name)", err)
+ ctx.Handle(500, "repo.SettingPost(change repository name)", err)
return
}
log.Trace("%s Repository name changed: %s/%s -> %s", ctx.Req.RequestURI, ctx.User.Name, ctx.Repo.Repository.Name, newRepoName)
- isNameChanged = true
ctx.Repo.Repository.Name = newRepoName
}
+ br := ctx.Query("branch")
+ if models.IsBranchExist(ctx.User.Name, ctx.Repo.Repository.Name, br) {
+ ctx.Repo.Repository.DefaultBranch = br
+ }
ctx.Repo.Repository.Description = ctx.Query("desc")
ctx.Repo.Repository.Website = ctx.Query("site")
ctx.Repo.Repository.IsGoget = ctx.Query("goget") == "on"
@@ -351,14 +353,10 @@ func SettingPost(ctx *middleware.Context) {
ctx.Handle(404, "repo.SettingPost(update)", err)
return
}
-
- ctx.Data["IsSuccess"] = true
- if isNameChanged {
- ctx.Redirect(fmt.Sprintf("/%s/%s/settings", ctx.Repo.Owner.Name, ctx.Repo.Repository.Name))
- } else {
- ctx.HTML(200, "repo/setting")
- }
log.Trace("%s Repository updated: %s/%s", ctx.Req.RequestURI, ctx.Repo.Owner.Name, ctx.Repo.Repository.Name)
+
+ ctx.Flash.Success("Repository options has been successfully updated.")
+ ctx.Redirect(fmt.Sprintf("/%s/%s/settings", ctx.Repo.Owner.Name, ctx.Repo.Repository.Name))
case "transfer":
if len(ctx.Repo.Repository.Name) == 0 || ctx.Repo.Repository.Name != ctx.Query("repository") {
ctx.RenderWithErr("Please make sure you entered repository name is correct.", "repo/setting", nil)
@@ -369,19 +367,18 @@ func SettingPost(ctx *middleware.Context) {
// Check if new owner exists.
isExist, err := models.IsUserExist(newOwner)
if err != nil {
- ctx.Handle(404, "repo.SettingPost(transfer: check existence)", err)
+ ctx.Handle(500, "repo.SettingPost(transfer: check existence)", err)
return
} else if !isExist {
ctx.RenderWithErr("Please make sure you entered owner name is correct.", "repo/setting", nil)
return
} else if err = models.TransferOwnership(ctx.User, newOwner, ctx.Repo.Repository); err != nil {
- ctx.Handle(404, "repo.SettingPost(transfer repository)", err)
+ ctx.Handle(500, "repo.SettingPost(transfer repository)", err)
return
}
log.Trace("%s Repository transfered: %s/%s -> %s", ctx.Req.RequestURI, ctx.User.Name, ctx.Repo.Repository.Name, newOwner)
ctx.Redirect("/")
- return
case "delete":
if len(ctx.Repo.Repository.Name) == 0 || ctx.Repo.Repository.Name != ctx.Query("repository") {
ctx.RenderWithErr("Please make sure you entered repository name is correct.", "repo/setting", nil)
@@ -389,11 +386,11 @@ func SettingPost(ctx *middleware.Context) {
}
if err := models.DeleteRepository(ctx.User.Id, ctx.Repo.Repository.Id, ctx.User.LowerName); err != nil {
- ctx.Handle(200, "repo.Delete", err)
+ ctx.Handle(500, "repo.Delete", err)
return
}
-
log.Trace("%s Repository deleted: %s/%s", ctx.Req.RequestURI, ctx.User.LowerName, ctx.Repo.Repository.LowerName)
+
ctx.Redirect("/")
}
}
diff --git a/templates/install.tmpl b/templates/install.tmpl
index 3aa64ccd4b..c1fd76659c 100644
--- a/templates/install.tmpl
+++ b/templates/install.tmpl
@@ -184,11 +184,7 @@
<strong>Enable Register Confirmation</strong>
</label>
</div>
- </div>
- </div>
- <div class="form-group">
- <div class="col-md-offset-3 col-md-7">
<div class="checkbox">
<label>
<input name="mail_notify" type="checkbox" {{if .mail_notify}}checked{{end}}>
diff --git a/templates/repo/diff.tmpl b/templates/repo/diff.tmpl
index 5c95ddefde..396aa795f5 100644
--- a/templates/repo/diff.tmpl
+++ b/templates/repo/diff.tmpl
@@ -30,12 +30,16 @@
{{range .Diff.Files}}
<li>
<div class="diff-counter count pull-right">
+ {{if Subtract .Addition .Deletion}}
<span class="add" data-line="{{.Addition}}">{{.Addition}}</span>
<span class="bar">
<span class="pull-left add"></span>
<span class="pull-left del"></span>
</span>
<span class="del" data-line="{{.Deletion}}">{{.Deletion}}</span>
+ {{else}}
+ <span>BIN</span>
+ {{end}}
</div>
<!-- todo finish all file status, now modify, add, delete and rename -->
<span class="status {{DiffTypeToStr .Type}}" data-toggle="tooltip" data-placement="right" title="{{DiffTypeToStr .Type}}"> </span>
@@ -49,12 +53,16 @@
<div class="panel panel-default diff-file-box diff-box file-content" id="diff-2">
<div class="panel-heading">
<div class="diff-counter count pull-left">
+ {{if Subtract .Addition .Deletion}}
<span class="add" data-line="{{.Addition}}">+ {{.Addition}}</span>
<span class="bar">
<span class="pull-left add"></span>
<span class="pull-left del"></span>
</span>
<span class="del" data-line="{{.Deletion}}">- {{.Deletion}}</span>
+ {{else}}
+ BIN
+ {{end}}
</div>
<a class="btn btn-default btn-sm pull-right" href="{{$.SourcePath}}/{{.Name}}">View File</a>
<span class="file">{{.Name}}</span>
diff --git a/templates/repo/setting.tmpl b/templates/repo/setting.tmpl
index 1adf0090c7..ff3b73b59a 100644
--- a/templates/repo/setting.tmpl
+++ b/templates/repo/setting.tmpl
@@ -12,7 +12,7 @@
</div>
<div id="repo-setting-container" class="col-md-9">
- {{if .IsSuccess}}<p class="alert alert-success">Repository options has been successfully updated.</p>{{else if .HasError}}<p class="alert alert-danger form-error">{{.ErrorMsg}}</p>{{end}}
+ {{template "base/alert" .}}
<div class="panel panel-default">
<div class="panel-heading">
Repository Options
@@ -44,14 +44,17 @@
</div>
</div>
<hr>
- <!-- <div class="form-group">
+ <div class="form-group">
<label class="col-md-3 text-right">Default Branch</label>
<div class="col-md-9">
<select name="branch" id="repo-default-branch" class="form-control">
- <option value="">Branch</option>
+ <option value="{{.Repository.DefaultBranch}}">{{.Repository.DefaultBranch}}</option>
+ {{range .Branches}}
+ {{if eq . $.Repository.DefaultBranch}}{{else}}<option value="{{.}}">{{.}}</option>{{end}}
+ {{end}}
</select>
</div>
- </div> -->
+ </div>
<div class="form-group">
<div class="col-md-offset-3 col-md-9">