fix some template bugs

This commit is contained in:
sentriz
2019-07-31 18:06:19 +01:00
parent e7c98808bb
commit ee6f9b4d96
2 changed files with 5 additions and 5 deletions

View File

@@ -4,7 +4,8 @@
<i class="mdi mdi-account-remove"></i> deleting user {{ .SelectedUser.Name }} <i class="mdi mdi-account-remove"></i> deleting user {{ .SelectedUser.Name }}
</div> </div>
<div class="text-right"> <div class="text-right">
are you sure? are you sure?<br/>
<span class="light">their plays, starred, etc. will also be deleted</span>
</div> </div>
<form action="/admin/delete_user_do?user={{ .SelectedUser.Name }}" method="post"> <form action="/admin/delete_user_do?user={{ .SelectedUser.Name }}" method="post">
<input type="submit" value="yes"> <input type="submit" value="yes">

View File

@@ -258,7 +258,7 @@ func (c *Controller) ServeUpdateLastFMAPIKey(w http.ResponseWriter, r *http.Requ
data.CurrentLastFMAPIKey = c.DB.GetSetting("lastfm_api_key") data.CurrentLastFMAPIKey = c.DB.GetSetting("lastfm_api_key")
data.CurrentLastFMAPISecret = c.DB.GetSetting("lastfm_secret") data.CurrentLastFMAPISecret = c.DB.GetSetting("lastfm_secret")
return &Response{ return &Response{
template: "create_user.tmpl", template: "update_lastfm_api_key.tmpl",
data: data, data: data,
} }
} }
@@ -267,15 +267,14 @@ func (c *Controller) ServeUpdateLastFMAPIKeyDo(w http.ResponseWriter, r *http.Re
session := r.Context().Value(key.Session).(*sessions.Session) session := r.Context().Value(key.Session).(*sessions.Session)
apiKey := r.FormValue("api_key") apiKey := r.FormValue("api_key")
secret := r.FormValue("secret") secret := r.FormValue("secret")
err := validateAPIKey(apiKey, secret) if err := validateAPIKey(apiKey, secret); err != nil {
if err != nil {
sessAddFlashW(err.Error(), session) sessAddFlashW(err.Error(), session)
sessLogSave(w, r, session) sessLogSave(w, r, session)
return &Response{redirect: r.Referer()} return &Response{redirect: r.Referer()}
} }
c.DB.SetSetting("lastfm_api_key", apiKey) c.DB.SetSetting("lastfm_api_key", apiKey)
c.DB.SetSetting("lastfm_secret", secret) c.DB.SetSetting("lastfm_secret", secret)
return &Response{redirect: r.Referer()} return &Response{redirect: "/admin/home"}
} }
func (c *Controller) ServeStartScanDo(w http.ResponseWriter, r *http.Request) *Response { func (c *Controller) ServeStartScanDo(w http.ResponseWriter, r *http.Request) *Response {