Merge branch 'feature/eta1.9.5_future_good' into debug

# Conflicts:
#	models/chart.go

services/data/chart_theme.go

@@ -29,6 +29,9 @@ func GetChartThemeConfig(chartThemeId, source, chartType int) (chartTheme *chart
 		newConfig, e := ConvertOldChartOptions(chartTheme.Config)
 		if e == nil {
 			chartTheme.Config = newConfig
+		} else {
+			err = e
+			return
 		}
 		return
 	}
@@ -55,6 +58,9 @@ func GetChartThemeConfig(chartThemeId, source, chartType int) (chartTheme *chart
 		newConfig, e := ConvertOldChartOptions(chartTheme.Config)
 		if e == nil {
 			chartTheme.Config = newConfig
+		} else {
+			err = e
+			return
 		}
 		return
 	}
@@ -66,6 +72,9 @@ func GetChartThemeConfig(chartThemeId, source, chartType int) (chartTheme *chart
 	newConfig, e := ConvertOldChartOptions(chartTheme.Config)
 	if e == nil {
 		chartTheme.Config = newConfig
+	} else {
+		err = e
+		return
 	}
 	return
 }