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

Fix the route() calls for L6

Browse Source
This commit is contained in:
Nabeel Shahzad
2019-09-13 18:20:50 -04:00
parent 0c89d36a16
commit 52332c250b
16 changed files with 27 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Contracts/Repository.php
View File

@@ -3,11 +3,9 @@
namespace App\Contracts; namespace App\Contracts;
use Illuminate\Validation\Validator; use Illuminate\Validation\Validator;
use Prettus\Repository\Eloquent\BaseRepository;
/** abstract class Repository extends BaseRepository
* Class Repository
*/
abstract class Repository extends \Prettus\Repository\Eloquent\BaseRepository
{ {
/** /**
* @param $id * @param $id
@@ -20,7 +18,7 @@ abstract class Repository extends \Prettus\Repository\Eloquent\BaseRepository
try { try {
return $this->find($id, $columns); return $this->find($id, $columns);
} catch (\Exception $e) { } catch (\Exception $e) {
return; return null;
} }
} }

2
app/Http/Controllers/Admin/AircraftController.php
View File

@@ -98,7 +98,7 @@ class AircraftController extends Controller
$aircraft = $this->aircraftRepo->create($attrs); $aircraft = $this->aircraftRepo->create($attrs);
Flash::success('Aircraft saved successfully.'); Flash::success('Aircraft saved successfully.');
return redirect(route('admin.aircraft.edit', ['id' => $aircraft->id])); return redirect(route('admin.aircraft.edit', [$aircraft->id]));
} }
/** /**

2
app/Http/Controllers/Admin/RankController.php
View File

@@ -107,7 +107,7 @@ class RankController extends Controller
Cache::forget(config('cache.keys.RANKS_PILOT_LIST.key')); Cache::forget(config('cache.keys.RANKS_PILOT_LIST.key'));
return redirect(route('admin.ranks.edit', ['id' => $model->id])); return redirect(route('admin.ranks.edit', [$model->id]));
} }
/** /**

2
app/Http/Controllers/Admin/SubfleetController.php
View File

@@ -155,7 +155,7 @@ class SubfleetController extends Controller
$subfleet = $this->subfleetRepo->create($input); $subfleet = $this->subfleetRepo->create($input);
Flash::success('Subfleet saved successfully.'); Flash::success('Subfleet saved successfully.');
return redirect(route('admin.subfleets.edit', ['id' => $subfleet->id])); return redirect(route('admin.subfleets.edit', [$subfleet->id]));
} }
/** /**

2
app/Http/Controllers/Admin/UserController.php
View File

@@ -299,6 +299,6 @@ class UserController extends Controller
flash('New API key generated!')->success(); flash('New API key generated!')->success();
return redirect(route('admin.users.edit', ['id' => $id])); return redirect(route('admin.users.edit', [$id]));
} }
} }

6
app/Http/Controllers/Frontend/PirepController.php
View File

@@ -335,7 +335,7 @@ class PirepController extends Controller
Flash::success('PIREP submitted!'); Flash::success('PIREP submitted!');
} }
return redirect(route('frontend.pireps.show', ['id' => $pirep->id])); return redirect(route('frontend.pireps.show', [$pirep->id]));
} }
/** /**
@@ -438,7 +438,7 @@ class PirepController extends Controller
return redirect(route('frontend.pireps.index')); return redirect(route('frontend.pireps.index'));
} }
return redirect(route('frontend.pireps.show', ['id' => $pirep->id])); return redirect(route('frontend.pireps.show', [$pirep->id]));
} }
/** /**
@@ -458,6 +458,6 @@ class PirepController extends Controller
} }
$this->pirepSvc->submit($pirep); $this->pirepSvc->submit($pirep);
return redirect(route('frontend.pireps.show', ['id' => $pirep->id])); return redirect(route('frontend.pireps.show', [$pirep->id]));
} }
} }

1
app/Http/Controllers/Frontend/ProfileController.php
View File

@@ -86,6 +86,7 @@ class ProfileController extends Controller
/** /**
* Show the edit for form the user's profile * Show the edit for form the user's profile
*
* @param Request $request * @param Request $request
* *
* @throws \Exception * @throws \Exception

4
resources/views/admin/pireps/actions.blade.php
View File

@@ -2,7 +2,7 @@
<tr> <tr>
<td> <td>
@if($pirep->state === PirepState::PENDING || $pirep->state === PirepState::REJECTED) @if($pirep->state === PirepState::PENDING || $pirep->state === PirepState::REJECTED)
{{ Form::open(['url' => route('admin.pirep.status', ['id' => $pirep->id]), {{ Form::open(['url' => route('admin.pirep.status', [$pirep->id]),
'method' => 'post', 'method' => 'post',
'name' => 'accept_'.$pirep->id, 'name' => 'accept_'.$pirep->id,
'id' => $pirep->id.'_accept', 'id' => $pirep->id.'_accept',
@@ -16,7 +16,7 @@
<td>&nbsp;</td> <td>&nbsp;</td>
<td> <td>
@if($pirep->state === PirepState::PENDING || $pirep->state === PirepState::ACCEPTED) @if($pirep->state === PirepState::PENDING || $pirep->state === PirepState::ACCEPTED)
{{ Form::open(['url' => route('admin.pirep.status', ['id' => $pirep->id]), {{ Form::open(['url' => route('admin.pirep.status', [$pirep->id]),
'method' => 'post', 'method' => 'post',
'name' => 'reject_'.$pirep->id, 'name' => 'reject_'.$pirep->id,
'id' => $pirep->id.'_reject', 'id' => $pirep->id.'_reject',

2
resources/views/admin/pireps/show_fields.blade.php
View File

@@ -35,7 +35,7 @@
<table class="table table-hover"> <table class="table table-hover">
<tr> <tr>
<td>Pilot</td> <td>Pilot</td>
<td><a href="{{ route('admin.users.show', ['id' => $pirep->pilot->id]) }}" <td><a href="{{ route('admin.users.show', [$pirep->pilot->id]) }}"
target="_blank">{{ $pirep->user->name }}</a> target="_blank">{{ $pirep->user->name }}</a>
</td> </td>
</tr> </tr>

2
resources/views/admin/users/fields.blade.php
View File

@@ -83,7 +83,7 @@
<!-- Submit Field --> <!-- Submit Field -->
<div class="form-group col-sm-6 text-right"> <div class="form-group col-sm-6 text-right">
{{--<a href="{{ route('admin.users.regen_apikey', ['id' => $user->id]) }}" class="btn btn-warning" {{--<a href="{{ route('admin.users.regen_apikey', [$user->id]) }}" class="btn btn-warning"
onclick="return confirm('Are you sure? This will reset this user\'s API key.')">new api key</a>--}} onclick="return confirm('Are you sure? This will reset this user\'s API key.')">new api key</a>--}}
&nbsp; &nbsp;
{{ Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) }} {{ Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) }}

4
resources/views/layouts/default/home.blade.php
View File

@@ -16,7 +16,7 @@
{{--</div>--}} {{--</div>--}}
<div class="header header-primary text-center blue-bg"> <div class="header header-primary text-center blue-bg">
<h3 class="title title-up text-white"> <h3 class="title title-up text-white">
<a href="{{ route('frontend.profile.show', ['id' => $user->id]) }}" class="text-white">{{ $user->name }}</a> <a href="{{ route('frontend.profile.show', [$user->id]) }}" class="text-white">{{ $user->name }}</a>
</h3> </h3>
<div class="photo-container"> <div class="photo-container">
@if ($user->avatar == null) @if ($user->avatar == null)
@@ -37,7 +37,7 @@
</div> </div>
</div> </div>
<div class="footer text-center"> <div class="footer text-center">
<a href="{{ route('frontend.profile.show', ['id' => $user->id]) }}" class="btn btn-neutral btn-sm">@lang('common.profile')</a> <a href="{{ route('frontend.profile.show', [$user->id]) }}" class="btn btn-neutral btn-sm">@lang('common.profile')</a>
</div> </div>
</div> </div>
@endforeach @endforeach

2
resources/views/layouts/default/pireps/pirep_card.blade.php
View File

@@ -3,7 +3,7 @@
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<p class="float-right"> <p class="float-right">
<a href="{{ route('frontend.pireps.edit', ['id' => $pirep->id]) }}" class="btn btn-sm btn-info">@lang('common.edit')</a> <a href="{{ route('frontend.pireps.edit', [$pirep->id]) }}" class="btn btn-sm btn-info">@lang('common.edit')</a>
</p> </p>
<h5> <h5>
<a href="{{ route('frontend.pireps.show', [$pirep->id]) }}"> <a href="{{ route('frontend.pireps.show', [$pirep->id]) }}">

8
resources/views/layouts/default/pireps/show.blade.php
View File

@@ -18,7 +18,7 @@
{{$pirep->dpt_airport->location}} {{$pirep->dpt_airport->location}}
</h4> </h4>
<p> <p>
<a href="{{route('frontend.airports.show', ['id' => $pirep->dpt_airport_id])}}"> <a href="{{route('frontend.airports.show', $pirep->dpt_airport_id)}}">
{{ $pirep->dpt_airport->full_name }} ({{ $pirep->dpt_airport_id }})</a> {{ $pirep->dpt_airport->full_name }} ({{ $pirep->dpt_airport_id }})</a>
<br/> <br/>
@if($pirep->block_off_time) @if($pirep->block_off_time)
@@ -35,7 +35,7 @@
{{$pirep->arr_airport->location}} {{$pirep->arr_airport->location}}
</h4> </h4>
<p> <p>
<a href="{{route('frontend.airports.show', ['id' => $pirep->arr_airport_id])}}"> <a href="{{route('frontend.airports.show', $pirep->arr_airport_id)}}">
{{ $pirep->arr_airport->full_name }} ({{ $pirep->arr_airport_id }})</a> {{ $pirep->arr_airport->full_name }} ({{ $pirep->arr_airport_id }})</a>
<br/> <br/>
@if($pirep->block_on_time) @if($pirep->block_on_time)
@@ -77,14 +77,14 @@
@if(!$pirep->read_only) @if(!$pirep->read_only)
<div class="float-right" style="margin-bottom: 10px;"> <div class="float-right" style="margin-bottom: 10px;">
<form method="get" <form method="get"
action="{{ route('frontend.pireps.edit', ['id' => $pirep->id]) }}" action="{{ route('frontend.pireps.edit', $pirep->id) }}"
style="display: inline"> style="display: inline">
@csrf @csrf
<button class="btn btn-info">@lang('common.edit')</button> <button class="btn btn-info">@lang('common.edit')</button>
</form> </form>
&nbsp; &nbsp;
<form method="post" <form method="post"
action="{{ route('frontend.pireps.submit', ['id' => $pirep->id]) }}" action="{{ route('frontend.pireps.submit', $pirep->id) }}"
style="display: inline"> style="display: inline">
@csrf @csrf
<button class="btn btn-success">@lang('common.submit')</button> <button class="btn btn-success">@lang('common.submit')</button>

8
resources/views/layouts/default/pireps/table.blade.php
View File

@@ -23,11 +23,11 @@
</td> </td>
<td> <td>
@if($pirep->dpt_airport){{ $pirep->dpt_airport->name }}@endif @if($pirep->dpt_airport){{ $pirep->dpt_airport->name }}@endif
(<a href="{{route('frontend.airports.show', ['id' => $pirep->dpt_airport_id])}}">{{$pirep->dpt_airport_id}}</a>) (<a href="{{route('frontend.airports.show', [$pirep->dpt_airport_id])}}">{{$pirep->dpt_airport_id}}</a>)
</td> </td>
<td> <td>
@if($pirep->arr_airport){{ $pirep->arr_airport->name }}@endif @if($pirep->arr_airport){{ $pirep->arr_airport->name }}@endif
(<a href="{{route('frontend.airports.show', ['id' => $pirep->arr_airport_id])}}">{{$pirep->arr_airport_id}}</a>) (<a href="{{route('frontend.airports.show', [$pirep->arr_airport_id])}}">{{$pirep->arr_airport_id}}</a>)
</td> </td>
<td> <td>
@if($pirep->aircraft) @if($pirep->aircraft)
@@ -58,9 +58,7 @@
</td> </td>
<td> <td>
@if(!$pirep->read_only) @if(!$pirep->read_only)
<a href="{{ route('frontend.pireps.edit', [ <a href="{{ route('frontend.pireps.edit', [$pirep->id]) }}">@lang('common.edit')</a>
'id' => $pirep->id,
]) }}">@lang('common.edit')</a>
@endif @endif
</td> </td>
</tr> </tr>

2
resources/views/layouts/default/profile/index.blade.php
View File

@@ -97,7 +97,7 @@
<a href="{{ route('frontend.profile.regen_apikey') }}" class="btn btn-warning" <a href="{{ route('frontend.profile.regen_apikey') }}" class="btn btn-warning"
onclick="return confirm({{ __('Are you sure? This will reset your API key.') }})">@lang('profile.newapikey')</a> onclick="return confirm({{ __('Are you sure? This will reset your API key.') }})">@lang('profile.newapikey')</a>
&nbsp; &nbsp;
<a href="{{ route('frontend.profile.edit', ['id' => $user->id]) }}" <a href="{{ route('frontend.profile.edit', [$user->id]) }}"
class="btn btn-primary">@lang('common.edit')</a> class="btn btn-primary">@lang('common.edit')</a>
</div> </div>

2
resources/views/layouts/default/users/table.blade.php
View File

@@ -22,7 +22,7 @@
</div> </div>
</td> </td>
<td> <td>
<a href="{{ route('frontend.profile.show.public', ['id' => $user->id]) }}"> <a href="{{ route('frontend.profile.show.public', [$user->id]) }}">
{{ $user->name }} {{ $user->name }}
</a> </a>
</td> </td>