Merge branch 'master' into develop

2017-12-12 13:19:07 +01:00
parent e98f573732 871b98c06b
commit cafed8ce8f
63 changed files with 1588 additions and 209 deletions
@@ -84,6 +84,11 @@ func SaveDashboard(cmd *m.SaveDashboardCommand) error {
 		} else {
 			dash.Version++
 			dash.Data.Set("version", dash.Version)
+
+			if !cmd.UpdatedAt.IsZero() {
+				dash.Updated = cmd.UpdatedAt
+			}
+
 			affectedRows, err = sess.MustCols("folder_id", "has_acl").Id(dash.Id).Update(dash)
 		}