Unverified Commit 6e0355fa authored by snipe's avatar snipe Committed by GitHub
Browse files

Merge pull request #9778 from inietov/fixes/users_departments_not_being_imported

Fixes #9730. Remove an else statement that doesn't allow to continue the importer flow.
parents 19994e20 131a285e
......@@ -125,8 +125,6 @@ class UserImporter extends ItemImporter
if ($department) {
$this->log('A matching department ' . $department_name . ' already exists');
return $department->id;
} else {
return null;
}
$department = new department();
......
......@@ -300,7 +300,7 @@
}
},
components: {
select2: require('../select2.vue')
select2: require('../select2.vue').default
}
}
</script>
\ No newline at end of file
......@@ -120,9 +120,9 @@
},
components: {
alert: require('../alert.vue'),
errors: require('./importer-errors.vue'),
importFile: require('./importer-file.vue'),
alert: require('../alert.vue').default,
errors: require('./importer-errors.vue').default,
importFile: require('./importer-file.vue').default,
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment