diff options
| author | Peter Smit <peter@smitmail.eu> | 2015-02-05 11:08:10 +0200 |
|---|---|---|
| committer | Peter Smit <peter@smitmail.eu> | 2015-02-05 11:08:10 +0200 |
| commit | 03af37554e34582e8c5a9d98ec9f2d3c9884f0d8 (patch) | |
| tree | e13334fb2bd83e02fdd05ec6895681d27876cd0f /modules/auth/user_form.go | |
| parent | fd1df86c44bfbd13b4df0a66840113b0d18695bc (diff) | |
| parent | 02c5bade0fabc24b9b7c05a74c65965e2e53f687 (diff) | |
Merge branch 'dev' into newcollaboration
Diffstat (limited to 'modules/auth/user_form.go')
| -rw-r--r-- | modules/auth/user_form.go | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/modules/auth/user_form.go b/modules/auth/user_form.go index becd5cbc..3c0ff651 100644 --- a/modules/auth/user_form.go +++ b/modules/auth/user_form.go @@ -12,26 +12,27 @@ import ( ) type InstallForm struct { - Database string `form:"database" binding:"Required"` - 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" 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)"` + DbType string `binding:"Required"` + DbHost string + DbUser string + DbPasswd string + DbName string + SSLMode string + DbPath string + RepoRootPath string `binding:"Required"` + RunUser string `binding:"Required"` + Domain string `binding:"Required"` + HTTPPort string `binding:"Required"` + AppUrl string `binding:"Required"` + SMTPHost string + SMTPEmail string + SMTPPasswd string + RegisterConfirm string + MailNotify string + AdminName string `binding:"Required;AlphaDashDot;MaxSize(30)"` + AdminPasswd string `binding:"Required;MinSize(6);MaxSize(255)"` + AdminConfirmPasswd string `binding:"Required;MinSize(6);MaxSize(255)"` + AdminEmail string `binding:"Required;Email;MaxSize(50)"` } func (f *InstallForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors { |