From 0fd754bbe0dab966ad3070dc24f9583c67c84513 Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 28 Mar 2014 07:26:22 -0400 Subject: Working on install page --- routers/install.go | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) (limited to 'routers/install.go') diff --git a/routers/install.go b/routers/install.go index d7d5159e..b44b8903 100644 --- a/routers/install.go +++ b/routers/install.go @@ -4,10 +4,28 @@ package routers -import "github.com/gogits/gogs/modules/middleware" +import ( + "errors" + + "github.com/gogits/gogs/models" + "github.com/gogits/gogs/modules/base" + "github.com/gogits/gogs/modules/middleware" +) + +func Install(ctx *middleware.Context) { + if base.InstallLock { + ctx.Handle(404, "install.Install", errors.New("Installation is prohibited")) + return + } -func Install(ctx *middleware.Context){ - ctx.Data["PageIsInstall"] = true ctx.Data["Title"] = "Install" - ctx.HTML(200,"install") + ctx.Data["DbCfg"] = models.DbCfg + ctx.Data["RepoRootPath"] = base.RepoRootPath + ctx.Data["RunUser"] = base.RunUser + ctx.Data["PageIsInstall"] = true + + if ctx.Req.Method == "GET" { + ctx.HTML(200, "install") + return + } } -- cgit v1.2.3 From 76b864234857ec01613db78ed19868a91795e99b Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 28 Mar 2014 09:06:48 -0400 Subject: Bug fix --- models/repo.go | 1 + routers/install.go | 1 + templates/install.tmpl | 10 ++++++++++ 3 files changed, 12 insertions(+) (limited to 'routers/install.go') diff --git a/models/repo.go b/models/repo.go index 726d435d..4be655d2 100644 --- a/models/repo.go +++ b/models/repo.go @@ -510,6 +510,7 @@ func NotifyWatchers(act *Action) error { continue } + act.Id = 0 act.UserId = watches[i].UserId if _, err = orm.InsertOne(act); err != nil { return errors.New("repo.NotifyWatchers(create action): " + err.Error()) diff --git a/routers/install.go b/routers/install.go index b44b8903..e0ac92f1 100644 --- a/routers/install.go +++ b/routers/install.go @@ -22,6 +22,7 @@ func Install(ctx *middleware.Context) { ctx.Data["DbCfg"] = models.DbCfg ctx.Data["RepoRootPath"] = base.RepoRootPath ctx.Data["RunUser"] = base.RunUser + ctx.Data["AppUrl"] = base.AppUrl ctx.Data["PageIsInstall"] = true if ctx.Req.Method == "GET" { diff --git a/templates/install.tmpl b/templates/install.tmpl index aace5e8a..be5a6918 100644 --- a/templates/install.tmpl +++ b/templates/install.tmpl @@ -83,6 +83,7 @@

The git copy of each repository is saved in this directory.

+
@@ -91,6 +92,15 @@

The user has access to visit and run Gogs.

+ +
+ + +
+ +

This affects HTTP/HTTPS clone URL and somewhere in e-mail.

+
+
-- cgit v1.2.3 From 6e376bb85c7a154c7567fd4be8cabc9627c8c6e7 Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 28 Mar 2014 18:40:31 -0400 Subject: Working on install page --- modules/auth/auth.go | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ routers/install.go | 3 ++- templates/install.tmpl | 8 ++++---- web.go | 2 +- 4 files changed, 57 insertions(+), 6 deletions(-) (limited to 'routers/install.go') diff --git a/modules/auth/auth.go b/modules/auth/auth.go index 2e0555f6..ac03a8f1 100644 --- a/modules/auth/auth.go +++ b/modules/auth/auth.go @@ -161,3 +161,53 @@ func AssignForm(form interface{}, data base.TmplData) { data[fieldName] = val.Field(i).Interface() } } + +type InstallForm struct { + Database string `form:"database" binding:"Required"` + Host string `form:"host"` + User string `form:"user"` + Passwd string `form:"passwd"` + DatabaseName string `form:"database_name"` + SslMode string `form:"ssl_mode"` + DatabasePath string `form:"database_path"` + RepoRootPath string `form:"repo_path"` + RunUser string `form:"run_user"` + AppUrl string `form:"app_url"` + AdminName string `form:"admin_name" binding:"Required"` + AdminPasswd string `form:"admin_pwd" binding:"Required;MinSize(6);MaxSize(30)"` + AdminEmail string `form:"admin_email" binding:"Required;Email;MaxSize(50)"` + SmtpHost string `form:"smtp_host"` + SmtpEmail string `form:"mailer_user"` + SmtpPasswd string `form:"mailer_pwd"` + RegisterConfirm string `form:"register_confirm"` + MailNotify string `form:"mail_notify"` +} + +func (f *InstallForm) Name(field string) string { + names := map[string]string{ + "Database": "Database name", + "AdminName": "Admin user name", + "AdminPasswd": "Admin password", + "AdminEmail": "Admin e-maill address", + } + return names[field] +} + +func (f *InstallForm) Validate(errors *binding.Errors, req *http.Request, context martini.Context) { + if req.Method == "GET" || errors.Count() == 0 { + return + } + + data := context.Get(reflect.TypeOf(base.TmplData{})).Interface().(base.TmplData) + data["HasError"] = true + AssignForm(f, data) + + if len(errors.Overall) > 0 { + for _, err := range errors.Overall { + log.Error("InstallForm.Validate: %v", err) + } + return + } + + validate(errors, data, f) +} diff --git a/routers/install.go b/routers/install.go index e0ac92f1..b5c3a936 100644 --- a/routers/install.go +++ b/routers/install.go @@ -8,11 +8,12 @@ import ( "errors" "github.com/gogits/gogs/models" + "github.com/gogits/gogs/modules/auth" "github.com/gogits/gogs/modules/base" "github.com/gogits/gogs/modules/middleware" ) -func Install(ctx *middleware.Context) { +func Install(ctx *middleware.Context, form auth.InstallForm) { if base.InstallLock { ctx.Handle(404, "install.Install", errors.New("Installation is prohibited")) return diff --git a/templates/install.tmpl b/templates/install.tmpl index 872982a0..d8f05fca 100644 --- a/templates/install.tmpl +++ b/templates/install.tmpl @@ -43,7 +43,7 @@
- +

Recommend use INNODB engine with utf8_general_ci charset.

@@ -64,7 +64,7 @@
- +

The file path of SQLite3 database.

@@ -78,7 +78,7 @@
- +

The git copy of each repository is saved in this directory.

@@ -88,7 +88,7 @@
- +

The user has access to visit and run Gogs.

diff --git a/web.go b/web.go index 4ed273ea..35695f0b 100644 --- a/web.go +++ b/web.go @@ -90,7 +90,7 @@ func runWeb(*cli.Context) { // Routers. m.Get("/", ignSignIn, routers.Home) - m.Get("/install", routers.Install) + m.Any("/install", routers.Install) m.Get("/issues", reqSignIn, user.Issues) m.Get("/pulls", reqSignIn, user.Pulls) m.Get("/stars", reqSignIn, user.Stars) -- cgit v1.2.3