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

Merge pull request #3617 from emanuelschuetze/issue3614

Browse Source 
Improved motion import/export (Fix #3614).
This commit is contained in:
Norman Jäckel 2018-03-04 20:59:24 +01:00 committed by GitHub
commit a30a30d72f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openslides/motions/static/js/motions/csv.js
View File

@ -76,8 +76,12 @@ angular.module('OpenSlidesApp.motions.csv', [])
// Submitters
if (params.include.submitters) {
var submitters = motion.submitters[0] ? motion.submitters[0].get_full_name() : '';
row.push('"' + submitters + '"');
var submitters = [];
angular.forEach(motion.submitters, function(user) {
var user_short_name = [user.title, user.first_name, user.last_name].join(' ').trim();
submitters.push(user_short_name);
});
row.push('"' + submitters.join('; ') + '"');
}
// Category

3
openslides/motions/static/js/motions/site.js
View File

@ -2119,7 +2119,8 @@ angular.module('OpenSlidesApp.motions.site', [
// submitter
if (motion.submitter && motion.submitter !== '') {
angular.forEach(User.getAll(), function (user) {
if (user.short_name == motion.submitter.trim()) {
var user_short_name = [user.title, user.first_name, user.last_name].join(' ').trim();
if (user_short_name == motion.submitter.trim()) {
motion.submitters_id = [user.id];
motion.submitter = user.full_name;
}