aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgima <gima@iki.fi>2014-07-18 05:11:40 +0300
committergima <gima@iki.fi>2014-07-18 05:30:57 +0300
commit5a97cc69edf47cec6005c58bc2e2d385e11229a6 (patch)
tree46aa113805d406e3a2ab883d175df8cf3a2546ec
parent6418caf23a623e45978abdd25ed32a29b12ad868 (diff)
Make possible for administrators to change user's password (fix proposal for #290)
-rw-r--r--modules/auth/admin.go1
-rw-r--r--routers/admin/user.go7
-rw-r--r--templates/admin/user/edit.tmpl7
3 files changed, 15 insertions, 0 deletions
diff --git a/modules/auth/admin.go b/modules/auth/admin.go
index 668afd9a..69161f90 100644
--- a/modules/auth/admin.go
+++ b/modules/auth/admin.go
@@ -16,6 +16,7 @@ import (
type AdminEditUserForm struct {
Email string `form:"email" binding:"Required;Email;MaxSize(50)"`
+ Passwd string `form:"passwd"`
Website string `form:"website" binding:"MaxSize(50)"`
Location string `form:"location" binding:"MaxSize(50)"`
Avatar string `form:"avatar" binding:"Required;Email;MaxSize(50)"`
diff --git a/routers/admin/user.go b/routers/admin/user.go
index cf99db2b..2d22cfdd 100644
--- a/routers/admin/user.go
+++ b/routers/admin/user.go
@@ -134,6 +134,13 @@ func EditUserPost(ctx *middleware.Context, params martini.Params, form auth.Admi
return
}
+ if (form.Passwd != "") {
+ u.Passwd = form.Passwd
+ u.Rands = models.GetUserSalt()
+ u.Salt = models.GetUserSalt()
+ u.EncodePasswd()
+ }
+
u.Email = form.Email
u.Website = form.Website
u.Location = form.Location
diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl
index 329c6673..aab1aaf1 100644
--- a/templates/admin/user/edit.tmpl
+++ b/templates/admin/user/edit.tmpl
@@ -45,6 +45,13 @@
</div>
</div>
+ <div class="form-group">
+ <label class="col-md-3 control-label">Password</label>
+ <div class="col-md-7">
+ <input name="passwd" type="password" class="form-control" placeholder="Type account's new password or leave unfilled">
+ </div>
+ </div>
+
<div class="form-group">
<label class="col-md-3 control-label">Website</label>
<div class="col-md-7">