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

Revert "Bug fix #1414 (#1487)" (#1492)

Browse Source 
This reverts commit b4311b861f.
This commit is contained in:
Nabeel S
2022-10-30 22:58:26 -04:00
committed by GitHub
parent b4311b861f
commit 41bd325f9a
2 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/Services/ImportExport/FlightImporter.php
View File

@@ -124,22 +124,10 @@ class FlightImporter extends ImportExport
}
// Create/check that they exist
$process_dep = $this->processAirport($row['dpt_airport']);
if (is_null($process_dep)) {
$this->log('Could not import row '.$index.'. Departure Airport not found!');
return false;
}
$process_arr = $this->processAirport($row['arr_airport']);
if (is_null($process_arr)) {
$this->log('Could not import row '.$index.'. Arrival Airport not found!');
return false;
}
$this->processAirport($row['dpt_airport']);
$this->processAirport($row['arr_airport']);
if ($row['alt_airport']) {
$process_alt = $this->processAirport($row['alt_airport']);
if (is_null($process_alt)) {
$this->log('Could not import row '.$index.'. Alternate Airport not found!');
return false;
}
$this->processAirport($row['alt_airport']);
}
// Check/calculate the distance
@@ -210,7 +198,7 @@ class FlightImporter extends ImportExport
*
* @return Airport
*/
protected function processAirport($airport): Airport|null
protected function processAirport($airport): Airport
{
return $this->airportSvc->lookupAirportIfNotFound($airport);
}

6
app/Services/ModuleService.php
View File

@@ -170,7 +170,7 @@ class ModuleService extends Service
]);
try {
Artisan::call('module:migrate '.$module_name);
Artisan::call('module:migrate '.$module_name, ['--force' => true]);
} catch (Exception $e) {
Log::error('Error running migration for '.$module_name.'; error='.$e);
}
@@ -269,7 +269,7 @@ class ModuleService extends Service
}
Artisan::call('config:cache');
Artisan::call('module:migrate '.$module);
Artisan::call('module:migrate '.$module, ['--force' => true]);
return flash()->success('Module Installed');
}
@@ -290,7 +290,7 @@ class ModuleService extends Service
]);
if ($status === true) {
Artisan::call('module:migrate '.$module->name);
Artisan::call('module:migrate '.$module->name, ['--force' => true]);
}
return true;