ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Emanuel Schütze 2017-02-14 19:33:56 +01:00
parent 0a1f4ffc1d
commit aa0791fc34
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openslides/agenda/static/js/agenda/base.js
View File

@ -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();

2
openslides/agenda/static/js/agenda/csv.js
View File

@ -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' : '') + '"');

3
openslides/topics/static/js/topics/base.js
View File

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