From 3c39aeee43aaadee31f3aea8d4d420cc783c6fc1 Mon Sep 17 00:00:00 2001 From: Nabeel Shahzad Date: Sat, 17 Mar 2018 12:19:26 -0500 Subject: [PATCH] Change rank field from image_link to image_url for consistency --- app/Console/Services/Importer.php | 2 +- .../migrations/2017_06_21_165410_create_ranks_table.php | 2 +- app/Models/Rank.php | 2 +- resources/views/admin/ranks/fields.blade.php | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/Console/Services/Importer.php b/app/Console/Services/Importer.php index 41b7eb3c..25b24f2e 100644 --- a/app/Console/Services/Importer.php +++ b/app/Console/Services/Importer.php @@ -348,7 +348,7 @@ class Importer { $rank = Rank::firstOrCreate( ['name' => $row->rank], - ['image_link' => $row->rankimage, 'hours'=>$row->minhours] + ['image_url' => $row->rankimage, 'hours'=>$row->minhours] ); $this->addMapping('ranks', $row->rankid, $rank->id); diff --git a/app/Database/migrations/2017_06_21_165410_create_ranks_table.php b/app/Database/migrations/2017_06_21_165410_create_ranks_table.php index 8d3dd7a5..82a1d087 100644 --- a/app/Database/migrations/2017_06_21_165410_create_ranks_table.php +++ b/app/Database/migrations/2017_06_21_165410_create_ranks_table.php @@ -16,7 +16,7 @@ class CreateRanksTable extends Migration Schema::create('ranks', function (Blueprint $table) { $table->increments('id'); $table->string('name', 50); - $table->string('image_link')->nullable(); + $table->string('image_url')->nullable(); $table->unsignedInteger('hours')->default(0); $table->unsignedDecimal('acars_base_pay_rate')->nullable()->default(0); $table->unsignedDecimal('manual_base_pay_rate')->nullable()->default(0); diff --git a/app/Models/Rank.php b/app/Models/Rank.php index 2185437f..b4aa8117 100644 --- a/app/Models/Rank.php +++ b/app/Models/Rank.php @@ -16,7 +16,7 @@ class Rank extends BaseModel public $fillable = [ 'name', 'hours', - 'image_link', + 'image_url', 'acars_base_pay_rate', 'manual_base_pay_rate', 'auto_approve_acars', diff --git a/resources/views/admin/ranks/fields.blade.php b/resources/views/admin/ranks/fields.blade.php index e64b10de..ca9ce068 100644 --- a/resources/views/admin/ranks/fields.blade.php +++ b/resources/views/admin/ranks/fields.blade.php @@ -7,9 +7,9 @@
- {{ Form::label('image_link', 'Image Link:') }} - {{ Form::text('image_link', null, ['class' => 'form-control']) }} -

{{ $errors->first('image_link') }}

+ {{ Form::label('image_url', 'Image Link:') }} + {{ Form::text('image_url', null, ['class' => 'form-control']) }} +

{{ $errors->first('image_url') }}