#1627 auto login after install if admin is configured

diff --git a/README.md b/README.md
index 5a7215426d2c049d36ba6fe9090299f243f10fb0..c75f1d7103c3f218949670f44ee2fac2c4cdd9d6 100644 (file)
--- a/README.md
+++ b/README.md
@@ -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  |
 |:-------------:|:-------:|:-------:|

diff --git a/gogs.go b/gogs.go
index b77540a7f1cb606d555475270493b72bf5404cc7..2923566cc410a925a6458e12eac24bea694decbb 100644 (file)
--- a/gogs.go
+++ b/gogs.go
@@ -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())

diff --git a/routers/install.go b/routers/install.go
index dc0ff2f2f1c8e4028c08fda305a6dc33a6c1d723..c47df0a54af6aeed69d57fa1d5789108cd58ec2f 100644 (file)
--- a/routers/install.go
+++ b/routers/install.go
@@ -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!")

diff --git a/templates/.VERSION b/templates/.VERSION
index 6b777ab5ae741999b89d7c46cc2f87a747714731..51f5e121b5a164b142f2b87ae557a99addfe1cbe 100644 (file)
--- a/templates/.VERSION
+++ b/templates/.VERSION
@@ -1 +1 @@
-0.7.33.1206 Beta
\ No newline at end of file
+0.7.34.1208 Beta
\ No newline at end of file