Merge pull request #121 from joubertredrat/feature-last-login

Last Login for admin manage your users
go-gitea · Nov 10, 2016 · 1b238fe · 1b238fe
2 parents c6c840f + f91cbf0
commit 1b238fe
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 40 deletions.
diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini
@@ -950,6 +950,8 @@ users.activated = Activated
 users.admin = Admin
 users.repos = Repos
 users.created = Created
+users.last_login = Last Login
+users.never_login = Never Login
 users.send_register_notify = Send Registration Notification To User
 users.new_success = New account '%s' has been created successfully.
 users.edit = Edit

diff --git a/models/user.go b/models/user.go
@@ -75,6 +75,8 @@ type User struct {
 	CreatedUnix int64
 	Updated     time.Time `xorm:"-"`
 	UpdatedUnix int64
+	LastLogin     time.Time `xorm:"-"`
+	LastLoginUnix int64
 
 	// Remember visibility choice for convenience, true for private
 	LastRepoVisibility bool
@@ -119,6 +121,11 @@ func (u *User) BeforeUpdate() {
 	u.UpdatedUnix = time.Now().Unix()
 }
 
+// Set time to last login
+func (u *User) SetLastLogin() {
+	u.LastLoginUnix = time.Now().Unix()
+}
+
 func (u *User) AfterSet(colName string, _ xorm.Cell) {
 	switch colName {
 	case "full_name":
@@ -127,6 +134,8 @@ func (u *User) AfterSet(colName string, _ xorm.Cell) {
 		u.Created = time.Unix(u.CreatedUnix, 0).Local()
 	case "updated_unix":
 		u.Updated = time.Unix(u.UpdatedUnix, 0).Local()
+	case "last_login_unix":
+		u.LastLogin = time.Unix(u.LastLoginUnix, 0).Local()
 	}
 }
 

diff --git a/modules/bindata/bindata.go b/modules/bindata/bindata.go
diff --git a/routers/user/auth.go b/routers/user/auth.go
@@ -127,6 +127,13 @@ func SignInPost(ctx *context.Context, form auth.SignInForm) {
 	// Clear whatever CSRF has right now, force to generate a new one
 	ctx.SetCookie(setting.CSRFCookieName, "", -1, setting.AppSubUrl)
 
+	// Register last login
+	u.SetLastLogin()
+	if err := models.UpdateUser(u); err != nil {
+	    ctx.Handle(500, "UpdateUser", err)
+	    return
+	}
+
 	if redirectTo, _ := url.QueryUnescape(ctx.GetCookie("redirect_to")); len(redirectTo) > 0 {
 		ctx.SetCookie("redirect_to", "", -1, setting.AppSubUrl)
 		ctx.Redirect(redirectTo)

diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl
@@ -25,6 +25,7 @@
 								<th>{{.i18n.Tr "admin.users.admin"}}</th>
 								<th>{{.i18n.Tr "admin.users.repos"}}</th>
 								<th>{{.i18n.Tr "admin.users.created"}}</th>
+								<th>{{.i18n.Tr "admin.users.last_login"}}</th>
 								<th>{{.i18n.Tr "admin.users.edit"}}</th>
 							</tr>
 						</thead>
@@ -38,6 +39,11 @@
 									<td><i class="fa fa{{if .IsAdmin}}-check{{end}}-square-o"></i></td>
 									<td>{{.NumRepos}}</td>
 									<td><span title="{{DateFmtLong .Created}}">{{DateFmtShort .Created }}</span></td>
+									{{if .LastLoginUnix}}
+										<td><span title="{{DateFmtLong .LastLogin}}">{{DateFmtShort .LastLogin }}</span></td>
+									{{else}}
+										<td><span>{{$.i18n.Tr "admin.users.never_login"}}</span></td>
+									{{end}}
 									<td><a href="{{$.Link}}/{{.ID}}"><i class="fa fa-pencil-square-o"></i></a></td>
 								</tr>
 							{{end}}