Moved dashboard theme option from the dashboard to a persisted user setting, #1458

This commit is contained in:
Torkel Ödegaard
2015-02-28 14:30:08 +01:00
parent 962b316bcf
commit 04ca85fe89
15 changed files with 56 additions and 35 deletions

View File

@@ -21,7 +21,7 @@ func init() {
bus.AddHandler("sql", ChangeUserPassword)
bus.AddHandler("sql", GetUserByLogin)
bus.AddHandler("sql", SetUsingOrg)
bus.AddHandler("sql", GetUserInfo)
bus.AddHandler("sql", GetUserProfile)
bus.AddHandler("sql", GetSignedInUser)
bus.AddHandler("sql", SearchUsers)
bus.AddHandler("sql", GetUserOrgList)
@@ -165,6 +165,7 @@ func UpdateUser(cmd *m.UpdateUserCommand) error {
Name: cmd.Name,
Email: cmd.Email,
Login: cmd.Login,
Theme: cmd.Theme,
Updated: time.Now(),
}
@@ -211,7 +212,7 @@ func SetUsingOrg(cmd *m.SetUsingOrgCommand) error {
})
}
func GetUserInfo(query *m.GetUserInfoQuery) error {
func GetUserProfile(query *m.GetUserProfileQuery) error {
var user m.User
has, err := x.Id(query.UserId).Get(&user)
@@ -221,10 +222,11 @@ func GetUserInfo(query *m.GetUserInfoQuery) error {
return m.ErrUserNotFound
}
query.Result = m.UserDTO{
query.Result = m.UserProfileDTO{
Name: user.Name,
Email: user.Email,
Login: user.Login,
Theme: user.Theme,
}
return err
@@ -247,6 +249,7 @@ func GetSignedInUser(query *m.GetSignedInUserQuery) error {
u.email as email,
u.login as login,
u.name as name,
u.theme as theme,
org.name as org_name,
org_user.role as org_role,
org.id as org_id