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

Merge pull request #1986 from emanuelschuetze/fixCSVimport

Browse Source 
Fix motions and users csv import.
This commit is contained in:
Emanuel Schütze 2016-02-17 21:23:28 +01:00
commit 41d9706a35
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -919,8 +919,8 @@ angular.module('OpenSlidesApp.motions.site', ['OpenSlidesApp.motions'])
$scope.csvImporting = true; $scope.csvImporting = true;
angular.forEach($scope.motions, function (motion) { angular.forEach($scope.motions, function (motion) {
if (!motion.importerror) { if (!motion.importerror) {
// create new user if not exist // create new user if not exists
if (!motion.submitters_id) { if (!motion.submitters_id && motion.submitter) {
var index = motion.submitter.indexOf(' '); var index = motion.submitter.indexOf(' ');
var user = { var user = {
first_name: motion.submitter.substr(0, index), first_name: motion.submitter.substr(0, index),
@ -934,8 +934,8 @@ angular.module('OpenSlidesApp.motions.site', ['OpenSlidesApp.motions'])
} }
); );
} }
// create new category if not exist // create new category if not exists
if (!motion.category_id) { if (!motion.category_id && motion.category) {
var category = { var category = {
name: motion.category, name: motion.category,
prefix: motion.category.charAt(0) prefix: motion.category.charAt(0)

2
openslides/users/static/js/users/site.js
View File

@ -721,6 +721,8 @@ angular.module('OpenSlidesApp.users.site', ['OpenSlidesApp.users'])
} else { } else {
user.is_active = false; user.is_active = false;
} }
} else {
user.is_active = false;
} }
$scope.users.push(user); $scope.users.push(user);
}); });