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

Change rank field from image_link to image_url for consistency

Browse Source
This commit is contained in:
Nabeel Shahzad
2018-03-17 12:19:26 -05:00
parent e9baf4acb5
commit 3c39aeee43
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Console/Services/Importer.php
View File

@@ -348,7 +348,7 @@ class Importer
{ {
$rank = Rank::firstOrCreate( $rank = Rank::firstOrCreate(
['name' => $row->rank], ['name' => $row->rank],
['image_link' => $row->rankimage, 'hours'=>$row->minhours] ['image_url' => $row->rankimage, 'hours'=>$row->minhours]
); );
$this->addMapping('ranks', $row->rankid, $rank->id); $this->addMapping('ranks', $row->rankid, $rank->id);

2
app/Database/migrations/2017_06_21_165410_create_ranks_table.php
View File

@@ -16,7 +16,7 @@ class CreateRanksTable extends Migration
Schema::create('ranks', function (Blueprint $table) { Schema::create('ranks', function (Blueprint $table) {
$table->increments('id'); $table->increments('id');
$table->string('name', 50); $table->string('name', 50);
$table->string('image_link')->nullable(); $table->string('image_url')->nullable();
$table->unsignedInteger('hours')->default(0); $table->unsignedInteger('hours')->default(0);
$table->unsignedDecimal('acars_base_pay_rate')->nullable()->default(0); $table->unsignedDecimal('acars_base_pay_rate')->nullable()->default(0);
$table->unsignedDecimal('manual_base_pay_rate')->nullable()->default(0); $table->unsignedDecimal('manual_base_pay_rate')->nullable()->default(0);

2
app/Models/Rank.php
View File

@@ -16,7 +16,7 @@ class Rank extends BaseModel
public $fillable = [ public $fillable = [
'name', 'name',
'hours', 'hours',
'image_link', 'image_url',
'acars_base_pay_rate', 'acars_base_pay_rate',
'manual_base_pay_rate', 'manual_base_pay_rate',
'auto_approve_acars', 'auto_approve_acars',

6
resources/views/admin/ranks/fields.blade.php
View File

@@ -7,9 +7,9 @@
</div> </div>
<div class="form-group col-md-6"> <div class="form-group col-md-6">
{{ Form::label('image_link', 'Image Link:') }} {{ Form::label('image_url', 'Image Link:') }}
{{ Form::text('image_link', null, ['class' => 'form-control']) }} {{ Form::text('image_url', null, ['class' => 'form-control']) }}
<p class="text-danger">{{ $errors->first('image_link') }}</p> <p class="text-danger">{{ $errors->first('image_url') }}</p>
</div> </div>
</div> </div>
<div class="row"> <div class="row">