lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge pull request #9778 from inietov/fixes/users_departments_not_being_imported

Browse source 
Fixes #9730. Remove an else statement that doesn't allow to continue the importer flow.
This commit is contained in:
snipe 2021-07-06 14:59:42 -07:00 • committed by GitHub
commit 6e0355fa34
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Importer/UserImporter.php
View file

@ -125,8 +125,6 @@ class UserImporter extends ItemImporter
if ($department) { if ($department) {
$this->log('A matching department ' . $department_name . ' already exists'); $this->log('A matching department ' . $department_name . ' already exists');
return $department->id; return $department->id;
} else {
return null;
} }
$department = new department(); $department = new department();

2
resources/assets/js/components/importer/importer-file.vue
View file

@ -300,7 +300,7 @@
} }
}, },
components: { components: {
select2: require('../select2.vue') select2: require('../select2.vue').default
} }
} }
</script> </script>

6
resources/assets/js/components/importer/importer.vue
View file

@ -120,9 +120,9 @@
}, },
components: { components: {
alert: require('../alert.vue'), alert: require('../alert.vue').default,
errors: require('./importer-errors.vue'), errors: require('./importer-errors.vue').default,
importFile: require('./importer-file.vue'), importFile: require('./importer-file.vue').default,
} }
} }