diff options
| author | Unknwon <joe2010xtmf@163.com> | 2014-09-07 19:02:58 -0400 |
|---|---|---|
| committer | Unknwon <joe2010xtmf@163.com> | 2014-09-07 19:02:58 -0400 |
| commit | 0ddb1eb769610f1d74997ad12d848ae5a0bdb4ab (patch) | |
| tree | 6f0422c8342a89f99de8664cf3bc4e4aec338cbc /modules | |
| parent | ab7206d6b787645956b0279f729bd7b22cbed690 (diff) | |
| download | gitea-0ddb1eb769610f1d74997ad12d848ae5a0bdb4ab.tar.gz gitea-0ddb1eb769610f1d74997ad12d848ae5a0bdb4ab.zip | |
Finish new install page, almost ready for 0.5 release
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/auth/user_form.go | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/modules/auth/user_form.go b/modules/auth/user_form.go index 51a07b9128..93bd01a9fd 100644 --- a/modules/auth/user_form.go +++ b/modules/auth/user_form.go @@ -13,24 +13,25 @@ import ( type InstallForm struct { Database string `form:"database" binding:"Required"` - Host string `form:"host"` - User string `form:"user"` - Passwd string `form:"passwd"` + DbHost string `form:"host"` + DbUser string `form:"user"` + DbPasswd 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"` - Domain string `form:"domain"` - AppUrl string `form:"app_url"` - AdminName string `form:"admin_name" binding:"Required;AlphaDashDot;MaxSize(30)"` - AdminPasswd string `form:"admin_pwd" binding:"Required;MinSize(6);MaxSize(255)"` - AdminEmail string `form:"admin_email" binding:"Required;Email;MaxSize(50)"` + RepoRootPath string `form:"repo_path" binding:"Required"` + RunUser string `form:"run_user" binding:"Required"` + Domain string `form:"domain" binding:"Required"` + AppUrl string `form:"app_url" binding:"Required"` 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"` + AdminName string `form:"admin_name" binding:"Required;AlphaDashDot;MaxSize(30)"` + AdminPasswd string `form:"admin_pwd" binding:"Required;MinSize(6);MaxSize(255)"` + ConfirmPasswd string `form:"confirm_passwd" binding:"Required;MinSize(6);MaxSize(255)"` + AdminEmail string `form:"admin_email" binding:"Required;Email;MaxSize(50)"` } func (f *InstallForm) Validate(ctx *macaron.Context, errs *binding.Errors, l i18n.Locale) { |