Merge branch 'undefined-titles' of https://github.com/cherylpinto/sugarizer into pr/2117

Author: Lionel Laské

activities/Chart.activity/js/activity.js

@@ -303,7 +303,8 @@ const app = new Vue({
 			this.LZ = this.SugarJournal.LZString;
 			if (metadata.mimetype === "text/csv") {
 				this.isCsvFile = true;
-				this.csvTitle = this.currentenv.activityName;
+				this.csvTitle = metadata.title || (this.currentenv ? this.currentenv.activityName : "Chart Data.csv");
+                this.updateActivityTitle(this.csvTitle);
 				this.pref.chartType = "csvMode";
 				const json = CSVParser.csvToJson(data);
 				if (this.$refs.csvView) {

activities/Measure.activity/js/activity.js

@@ -858,9 +858,12 @@ var app = new Vue({
 			}
 
 			var vm = this;
+			var userName = (vm.currentenv && vm.currentenv.user && vm.currentenv.user.name) ? vm.currentenv.user.name : "Unknown";
+            var logTitle = this.SugarL10n.get("MeasureLoggingBy", { name: userName });
+            var csvTitle = logTitle ? logTitle + ".csv" : "Measure Data.csv";
 			var metadata = {
 				mimetype: "text/csv",
-				title: this.SugarL10n.get("MeasureLoggingBy", { name: vm.currentenv.user.name}) + ".csv",
+				title: csvTitle,
 				activity: "org.sugarlabs.ChartActivity",
 				timestamp: new Date().getTime(),
 				creation_time: new Date().getTime(),