Able to save preference version, created, updated fields

pkg/api/preferences.go

@@ -13,7 +13,7 @@ func SavePreferences(c *middleware.Context, cmd m.SavePreferencesCommand) Respon
 	cmd.OrgId = c.OrgId
 	cmd.OrgId = c.OrgId
 
 
 	if err := bus.Dispatch(&cmd); err != nil {
 	if err := bus.Dispatch(&cmd); err != nil {
-		return ApiError(500, "Failed to saved preferences", err)
+		return ApiError(500, "Failed to save preferences", err)
 	}
 	}
 
 
 	return ApiSuccess("Preferences saved")
 	return ApiSuccess("Preferences saved")

pkg/services/sqlstore/preferences.go

@@ -3,6 +3,7 @@ package sqlstore
 import (
 import (
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/bus"
 	m "github.com/grafana/grafana/pkg/models"
 	m "github.com/grafana/grafana/pkg/models"
+	"time"
 )
 )
 
 
 func init() {
 func init() {
@@ -54,10 +55,12 @@ func SavePreferences(cmd *m.SavePreferencesCommand) error {
 			savePref.UserId = cmd.UserId
 			savePref.UserId = cmd.UserId
 			savePref.OrgId = cmd.OrgId
 			savePref.OrgId = cmd.OrgId
 			savePref.Preference = cmd.Preference
 			savePref.Preference = cmd.Preference
+			savePref = SetPreferencesModel(savePref, false)
 			affectedRows, saveErr = sess.Insert(&savePref)
 			affectedRows, saveErr = sess.Insert(&savePref)
 		} else {
 		} else {
 			savePref = prefResults[0]
 			savePref = prefResults[0]
 			savePref.Preference = cmd.Preference
 			savePref.Preference = cmd.Preference
+			savePref = SetPreferencesModel(savePref, true)
 			affectedRows, saveErr = sess.Id(savePref.Id).Update(&savePref)
 			affectedRows, saveErr = sess.Id(savePref.Id).Update(&savePref)
 		}
 		}
 
 
@@ -68,3 +71,16 @@ func SavePreferences(cmd *m.SavePreferencesCommand) error {
 		return saveErr
 		return saveErr
 	})
 	})
 }
 }
+
+func SetPreferencesModel(pref m.Preferences, updating bool) m.Preferences {
+
+	if updating {
+		pref.Version = pref.Version + 1
+	} else {
+		pref.Version = 0
+		pref.Created = time.Now()
+	}
+	pref.Updated = time.Now()
+
+	return pref
+}