Merge pull request #2959 from emanuelschuetze/issue2954

Added missing topic text to agenda csv export (Fixed #2954).

openslides/agenda/static/js/agenda/base.js

@@ -87,6 +87,16 @@ angular.module('OpenSlidesApp.agenda', ['OpenSlidesApp.users'])
                 getAgendaTitle: function () {
                     return this.title;
                 },
+                getCSVExportText: function () {
+                    var text;
+                    try {
+                        text =  this.getContentObject().getCSVExportText();
+                    } catch (e) {
+                        // when the content object is not in the DS store
+                        // or 'getCSVExportText' is not defined return nothing.
+                    }
+                    return text;
+                },
                 // link name which is shown in search result
                 getSearchResultName: function () {
                     return this.getAgendaTitle();

openslides/agenda/static/js/agenda/csv.js

@@ -26,7 +26,7 @@ angular.module('OpenSlidesApp.agenda.csv', [])
                             { seconds: 'disabled',
                                 hours: 'enabled' }) : '';
                     row.push('"' + (item.title || '') + '"');
-                    row.push('"' + (item.text || '') + '"');
+                    row.push('"' + (item.getCSVExportText() || '') + '"');
                     row.push('"' + duration + '"');
                     row.push('"' + (item.comment || '') + '"');
                     row.push('"' + (item.is_hidden ? '1' : '')  + '"');

openslides/topics/static/js/topics/base.js

@@ -21,6 +21,9 @@ angular.module('OpenSlidesApp.topics', [])
                 getAgendaTitle: function () {
                     return this.title;
                 },
+                getCSVExportText: function () {
+                    return this.text;
+                },
             },
             relations: {
                 belongsTo: {