github-mirror/gitea
2
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2024-11-22 13:20:33 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

#1627 auto login after install if admin is configured

Browse Source
This commit is contained in:
Unknwon 2015-12-08 00:59:14 -05:00
parent b1a53f6d8e
commit 2528c482e9
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -5,7 +5,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra
![](public/img/gogs-large-resize.png)
##### Current version: 0.7.33 Beta
##### Current version: 0.7.34 Beta
| Web | UI | Preview |
|:-------------:|:-------:|:-------:|

2
gogs.go
View File

@ -17,7 +17,7 @@ import (
"github.com/gogits/gogs/modules/setting"
)
const APP_VER = "0.7.33.1206 Beta"
const APP_VER = "0.7.34.1208 Beta"
func init() {
runtime.GOMAXPROCS(runtime.NumCPU())

12
routers/install.go
View File

@ -332,15 +332,16 @@ func InstallPost(ctx *middleware.Context, form auth.InstallForm) {
GlobalInit()
// Create admin account.
// Create admin account
if len(form.AdminName) > 0 {
if err := models.CreateUser(&models.User{
u := &models.User{
Name: form.AdminName,
Email: form.AdminEmail,
Passwd: form.AdminPasswd,
IsAdmin: true,
IsActive: true,
}); err != nil {
}
if err := models.CreateUser(u); err != nil {
if !models.IsErrUserAlreadyExist(err) {
setting.InstallLock = false
ctx.Data["Err_AdminName"] = true
@ -349,7 +350,12 @@ func InstallPost(ctx *middleware.Context, form auth.InstallForm) {
return
}
log.Info("Admin account already exist")
u, _ = models.GetUserByName(u.Name)
}
// Auto-login for admin
ctx.Session.Set("uid", u.Id)
ctx.Session.Set("uname", u.Name)
}
log.Info("First-time run install finished!")

2
templates/.VERSION
View File

@ -1 +1 @@
0.7.33.1206 Beta
0.7.34.1208 Beta