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

Fixes (#435)

Browse Source 
* Add flight level field to PIREP field closes #401

* Default value for distance 0 closes #400

* Block airline deletion if assets exist #367

* Formatting

* Move some of the base exception classes

* Fix skin references to use settings table

* Set default for theme name if setting is wrong
This commit is contained in:
Nabeel S
2019-11-19 10:06:07 -05:00
committed by GitHub
parent c643833496
commit 3ec64c989b
39 changed files with 237 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/Http/Controllers/Admin/AirlinesController.php
View File

@@ -6,27 +6,28 @@ use App\Contracts\Controller;
use App\Http\Requests\CreateAirlineRequest;
use App\Http\Requests\UpdateAirlineRequest;
use App\Repositories\AirlineRepository;
use App\Services\AirlineService;
use App\Support\Countries;
use Flash;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Laracasts\Flash\Flash;
use Prettus\Repository\Criteria\RequestCriteria;
use Response;
/**
* Class AirlinesController
*/
class AirlinesController extends Controller
{
private $airlineRepo;
private $airlineSvc;
/**
* AirlinesController constructor.
*
* @param AirlineRepository $airlinesRepo
* @param $airlineSvc
*/
public function __construct(AirlineRepository $airlinesRepo)
public function __construct(AirlineRepository $airlinesRepo, AirlineService $airlineSvc)
{
$this->airlineRepo = $airlinesRepo;
$this->airlineSvc = $airlineSvc;
}
/**
@@ -145,13 +146,18 @@ class AirlinesController extends Controller
*/
public function destroy($id)
{
$airlines = $this->airlineRepo->findWithoutFail($id);
$airline = $this->airlineRepo->findWithoutFail($id);
if (empty($airlines)) {
if (empty($airline)) {
Flash::error('Airlines not found');
return redirect(route('admin.airlines.index'));
}
if (!$this->airlineSvc->canDeleteAirline($airline)) {
Flash::error('Airlines cannot be deleted; flights/PIREPs/subfleets exist');
return redirect(route('admin.airlines.index'));
}
$this->airlineRepo->delete($id);
Flash::success('Airlines deleted successfully.');