FGFS-4.1/phpvms
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Account for admin role, don't error out on null rows #632 (#637)

Browse Source
This commit is contained in:
Nabeel S 2020-03-23 11:50:15 -04:00 committed by GitHub
parent 9e5386264f
commit 877d5a5479
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/Importer/Services/Importers/AircraftImporter.php
View File

@ -46,7 +46,6 @@ class AircraftImporter extends BaseImporter
}
$subfleet = $this->getSubfleet($subfleet_name, $row->icao, $airline_id);
$this->info('Subfleet ID is '.$subfleet->id);
$where = [
'registration' => $row->registration,

21
modules/Importer/Services/Importers/GroupImporter.php
View File

@ -5,6 +5,7 @@ namespace Modules\Importer\Services\Importers;
use App\Models\Permission;
use App\Models\Role;
use App\Services\RoleService;
use Illuminate\Support\Facades\Log;
use Modules\Importer\Services\BaseImporter;
/**
@ -110,7 +111,25 @@ class GroupImporter extends BaseImporter
}
// Get the ID of the permission
$permissions[] = $permMappings[$this->legacy_to_permission[$legacy_name]];
try {
$permName = $this->legacy_to_permission[$legacy_name];
if ($permName === 'admin') {
foreach ($permMappings as $name => $value) {
if (!in_array($value, $permissions)) {
$permissions[] = $value;
}
}
continue;
}
$permMapId = $permMappings[$permName];
if (!in_array($permMapId, $permissions)) {
$permissions[] = $permMapId;
}
} catch (\Exception $e) {
Log::error($e->getMessage());
}
}
}

4
modules/Importer/Utils/ImporterDB.php
View File

@ -195,7 +195,7 @@ class ImporterDB
$rows = [];
$result = $this->readRowsOffset($table, $this->batchSize, $offset, $order_by, $fields);
if ($result === false) {
if ($result === false || $result === null) {
return [];
}
@ -203,7 +203,7 @@ class ImporterDB
foreach ($result as $row) {
$rows[] = $row;
}
} catch (Exception $e) {
} catch (\Exception $e) {
Log::error('foreach rows error: '.$e->getMessage());
}