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

hide all cancelled pireps #180

Browse Source
This commit is contained in:
Nabeel Shahzad
2018-02-10 13:25:40 -06:00
parent 3ded06390c
commit 8acb9291fe
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Database/migrations/2017_06_07_014930_create_settings_table.php
+2 -2
View File
@@ -136,13 +136,13 @@ class CreateSettingsTable extends Migration
'description' => 'The time in minutes to check for a duplicate PIREP', 'description' => 'The time in minutes to check for a duplicate PIREP',
]); ]);
$this->addSetting('pireps.hide_cancelled_pireps', [ /*$this->addSetting('pireps.hide_cancelled_pireps', [
'name' => 'Hide Cancelled PIREPs', 'name' => 'Hide Cancelled PIREPs',
'group' => 'pireps', 'group' => 'pireps',
'value' => true, 'value' => true,
'type' => 'boolean', 'type' => 'boolean',
'description' => 'Hide any cancelled PIREPs in the front-end', 'description' => 'Hide any cancelled PIREPs in the front-end',
]); ]);*/
$this->addSetting('pireps.restrict_aircraft_to_rank', [ $this->addSetting('pireps.restrict_aircraft_to_rank', [
'name' => 'Restrict Aircraft to Ranks', 'name' => 'Restrict Aircraft to Ranks',
app/Http/Controllers/Frontend/PirepController.php
+1 -4
View File
@@ -94,10 +94,7 @@ class PirepController extends Controller
$user = Auth::user(); $user = Auth::user();
$where = [['user_id', $user->id]]; $where = [['user_id', $user->id]];
$where[] = ['state', '<>', PirepState::CANCELLED];
if(setting('pireps.hide_cancelled_pireps')) {
$where[] = ['state', '<>', PirepState::CANCELLED];
}
$this->pirepRepo->pushCriteria(new WhereCriteria($request, $where)); $this->pirepRepo->pushCriteria(new WhereCriteria($request, $where));
$pireps = $this->pirepRepo->orderBy('created_at', 'desc')->paginate(); $pireps = $this->pirepRepo->orderBy('created_at', 'desc')->paginate();
app/Models/User.php
+3 -1
View File
@@ -2,6 +2,7 @@
namespace App\Models; namespace App\Models;
use App\Models\Enums\PirepState;
use Illuminate\Notifications\Notifiable; use Illuminate\Notifications\Notifiable;
use Illuminate\Foundation\Auth\User as Authenticatable; use Illuminate\Foundation\Auth\User as Authenticatable;
use Laratrust\Traits\LaratrustUserTrait; use Laratrust\Traits\LaratrustUserTrait;
@@ -159,7 +160,8 @@ class User extends Authenticatable
public function pireps() public function pireps()
{ {
return $this->hasMany(Pirep::class, 'user_id'); return $this->hasMany(Pirep::class, 'user_id')
->where('state', '!=', PirepState::CANCELLED);
} }
public function rank() public function rank()