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

Aircraft status field blank causes error #603 (#604)

Browse Source 
* Update composer lock file

* Require aircraft status #603
This commit is contained in:
Nabeel S 2020-03-01 11:18:23 -05:00 committed by GitHub
parent ea9ee985e8
commit f78d065858
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 97 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,7 +80,7 @@ class AircraftController extends Controller
return view('admin.aircraft.create', [
'airports' => $this->airportRepo->selectBoxList(),
'subfleets' => Subfleet::all()->pluck('name', 'id'),
'statuses' => AircraftStatus::select(true),
'statuses' => AircraftStatus::select(false),
'subfleet_id' => $request->query('subfleet'),
]);
}
@ -88,7 +88,11 @@ class AircraftController extends Controller
/**
* Store a newly created Aircraft in storage.
*
* @param \App\Http\Requests\CreateAircraftRequest $request
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function store(CreateAircraftRequest $request)
{
@ -140,7 +144,7 @@ class AircraftController extends Controller
'aircraft' => $aircraft,
'airports' => $this->airportRepo->selectBoxList(),
'subfleets' => Subfleet::all()->pluck('name', 'id'),
'statuses' => AircraftStatus::select(true),
'statuses' => AircraftStatus::select(false),
]);
}
@ -148,6 +152,7 @@ class AircraftController extends Controller
* Update the specified Aircraft in storage.
*
* @param mixed $id
* @param UpdateAircraftRequest $request
*
* @throws \Prettus\Validator\Exceptions\ValidatorException
*

1
app/Models/Aircraft.php
View File

@ -58,6 +58,7 @@ class Aircraft extends Model
public static $rules = [
'subfleet_id' => 'required',
'name' => 'required',
'status' => 'required',
'registration' => 'required',
];

175
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "30e2e357e76a813ae0179df9e40215e9",
"content-hash": "3ecbeb1fd297e2827adb61806383aa5b",
"packages": [
{
"name": "akaunting/money",
@ -2788,16 +2788,16 @@
},
{
"name": "league/commonmark",
"version": "1.3.0",
"version": "1.3.1",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/commonmark.git",
"reference": "4f30be7a2cbf3bfa5788abab71384713e48f451f"
"reference": "8015f806173c6ee54de25a87c2d69736696e88db"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/commonmark/zipball/4f30be7a2cbf3bfa5788abab71384713e48f451f",
"reference": "4f30be7a2cbf3bfa5788abab71384713e48f451f",
"url": "https://api.github.com/repos/thephpleague/commonmark/zipball/8015f806173c6ee54de25a87c2d69736696e88db",
"reference": "8015f806173c6ee54de25a87c2d69736696e88db",
"shasum": ""
},
"require": {
@ -2858,7 +2858,7 @@
"md",
"parser"
],
"time": "2020-02-08T23:42:03+00:00"
"time": "2020-02-28T18:53:50+00:00"
},
{
"name": "league/csv",
@ -5235,16 +5235,16 @@
},
{
"name": "symfony/console",
"version": "v4.4.4",
"version": "v4.4.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "f512001679f37e6a042b51897ed24a2f05eba656"
"reference": "4fa15ae7be74e53f6ec8c83ed403b97e23b665e9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/f512001679f37e6a042b51897ed24a2f05eba656",
"reference": "f512001679f37e6a042b51897ed24a2f05eba656",
"url": "https://api.github.com/repos/symfony/console/zipball/4fa15ae7be74e53f6ec8c83ed403b97e23b665e9",
"reference": "4fa15ae7be74e53f6ec8c83ed403b97e23b665e9",
"shasum": ""
},
"require": {
@ -5307,20 +5307,20 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
"time": "2020-01-25T12:44:29+00:00"
"time": "2020-02-24T13:10:00+00:00"
},
{
"name": "symfony/css-selector",
"version": "v5.0.4",
"version": "v5.0.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
"reference": "ff60c90cb7950b592ebc84ad1289d0345bf24f9f"
"reference": "a0b51ba9938ccc206d9284de7eb527c2d4550b44"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/css-selector/zipball/ff60c90cb7950b592ebc84ad1289d0345bf24f9f",
"reference": "ff60c90cb7950b592ebc84ad1289d0345bf24f9f",
"url": "https://api.github.com/repos/symfony/css-selector/zipball/a0b51ba9938ccc206d9284de7eb527c2d4550b44",
"reference": "a0b51ba9938ccc206d9284de7eb527c2d4550b44",
"shasum": ""
},
"require": {
@ -5360,20 +5360,20 @@
],
"description": "Symfony CssSelector Component",
"homepage": "https://symfony.com",
"time": "2020-01-04T14:08:26+00:00"
"time": "2020-02-04T09:41:09+00:00"
},
{
"name": "symfony/debug",
"version": "v4.4.4",
"version": "v4.4.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
"reference": "20236471058bbaa9907382500fc14005c84601f0"
"reference": "a980d87a659648980d89193fd8b7a7ca89d97d21"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/debug/zipball/20236471058bbaa9907382500fc14005c84601f0",
"reference": "20236471058bbaa9907382500fc14005c84601f0",
"url": "https://api.github.com/repos/symfony/debug/zipball/a980d87a659648980d89193fd8b7a7ca89d97d21",
"reference": "a980d87a659648980d89193fd8b7a7ca89d97d21",
"shasum": ""
},
"require": {
@ -5416,26 +5416,26 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
"time": "2020-01-25T12:44:29+00:00"
"time": "2020-02-23T14:41:43+00:00"
},
{
"name": "symfony/error-handler",
"version": "v4.4.4",
"version": "v4.4.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/error-handler.git",
"reference": "d2721499ffcaf246a743e01cdf6696d3d5dd74c1"
"reference": "89aa4b9ac6f1f35171b8621b24f60477312085be"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/error-handler/zipball/d2721499ffcaf246a743e01cdf6696d3d5dd74c1",
"reference": "d2721499ffcaf246a743e01cdf6696d3d5dd74c1",
"url": "https://api.github.com/repos/symfony/error-handler/zipball/89aa4b9ac6f1f35171b8621b24f60477312085be",
"reference": "89aa4b9ac6f1f35171b8621b24f60477312085be",
"shasum": ""
},
"require": {
"php": "^7.1.3",
"psr/log": "~1.0",
"symfony/debug": "^4.4",
"symfony/debug": "^4.4.5",
"symfony/var-dumper": "^4.4|^5.0"
},
"require-dev": {
@ -5472,20 +5472,20 @@
],
"description": "Symfony ErrorHandler Component",
"homepage": "https://symfony.com",
"time": "2020-01-27T09:48:47+00:00"
"time": "2020-02-26T11:45:31+00:00"
},
{
"name": "symfony/event-dispatcher",
"version": "v4.4.4",
"version": "v4.4.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
"reference": "9e3de195e5bc301704dd6915df55892f6dfc208b"
"reference": "4ad8e149799d3128621a3a1f70e92b9897a8930d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/9e3de195e5bc301704dd6915df55892f6dfc208b",
"reference": "9e3de195e5bc301704dd6915df55892f6dfc208b",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/4ad8e149799d3128621a3a1f70e92b9897a8930d",
"reference": "4ad8e149799d3128621a3a1f70e92b9897a8930d",
"shasum": ""
},
"require": {
@ -5542,7 +5542,7 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
"time": "2020-01-10T21:54:01+00:00"
"time": "2020-02-04T09:32:40+00:00"
},
{
"name": "symfony/event-dispatcher-contracts",
@ -5604,7 +5604,7 @@
},
{
"name": "symfony/filesystem",
"version": "v4.4.4",
"version": "v4.4.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
@ -5654,16 +5654,16 @@
},
{
"name": "symfony/finder",
"version": "v4.4.4",
"version": "v4.4.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
"reference": "3a50be43515590faf812fbd7708200aabc327ec3"
"reference": "ea69c129aed9fdeca781d4b77eb20b62cf5d5357"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/3a50be43515590faf812fbd7708200aabc327ec3",
"reference": "3a50be43515590faf812fbd7708200aabc327ec3",
"url": "https://api.github.com/repos/symfony/finder/zipball/ea69c129aed9fdeca781d4b77eb20b62cf5d5357",
"reference": "ea69c129aed9fdeca781d4b77eb20b62cf5d5357",
"shasum": ""
},
"require": {
@ -5699,20 +5699,20 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
"time": "2020-01-04T13:00:46+00:00"
"time": "2020-02-14T07:42:58+00:00"
},
{
"name": "symfony/http-foundation",
"version": "v4.4.4",
"version": "v4.4.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
"reference": "491a20dfa87e0b3990170593bc2de0bb34d828a5"
"reference": "7e41b4fcad4619535f45f8bfa7744c4f384e1648"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/491a20dfa87e0b3990170593bc2de0bb34d828a5",
"reference": "491a20dfa87e0b3990170593bc2de0bb34d828a5",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/7e41b4fcad4619535f45f8bfa7744c4f384e1648",
"reference": "7e41b4fcad4619535f45f8bfa7744c4f384e1648",
"shasum": ""
},
"require": {
@ -5754,20 +5754,20 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com",
"time": "2020-01-31T09:11:17+00:00"
"time": "2020-02-13T19:40:01+00:00"
},
{
"name": "symfony/http-kernel",
"version": "v4.4.4",
"version": "v4.4.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
"reference": "62116a9c8fb15faabb158ad9cb785c353c2572e5"
"reference": "8c8734486dada83a6041ab744709bdc1651a8462"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/62116a9c8fb15faabb158ad9cb785c353c2572e5",
"reference": "62116a9c8fb15faabb158ad9cb785c353c2572e5",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/8c8734486dada83a6041ab744709bdc1651a8462",
"reference": "8c8734486dada83a6041ab744709bdc1651a8462",
"shasum": ""
},
"require": {
@ -5844,11 +5844,11 @@
],
"description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com",
"time": "2020-01-31T12:45:06+00:00"
"time": "2020-02-29T10:31:38+00:00"
},
{
"name": "symfony/inflector",
"version": "v5.0.4",
"version": "v5.0.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/inflector.git",
@ -5906,16 +5906,16 @@
},
{
"name": "symfony/mime",
"version": "v5.0.4",
"version": "v5.0.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/mime.git",
"reference": "2a3c7fee1f1a0961fa9cf360d5da553d05095e59"
"reference": "9b3e5b5e58c56bbd76628c952d2b78556d305f3c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/mime/zipball/2a3c7fee1f1a0961fa9cf360d5da553d05095e59",
"reference": "2a3c7fee1f1a0961fa9cf360d5da553d05095e59",
"url": "https://api.github.com/repos/symfony/mime/zipball/9b3e5b5e58c56bbd76628c952d2b78556d305f3c",
"reference": "9b3e5b5e58c56bbd76628c952d2b78556d305f3c",
"shasum": ""
},
"require": {
@ -5964,7 +5964,7 @@
"mime",
"mime-type"
],
"time": "2020-01-04T14:08:26+00:00"
"time": "2020-02-04T09:41:09+00:00"
},
{
"name": "symfony/polyfill-ctype",
@ -6319,16 +6319,16 @@
},
{
"name": "symfony/process",
"version": "v4.4.4",
"version": "v4.4.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
"reference": "f5697ab4cb14a5deed7473819e63141bf5352c36"
"reference": "bf9166bac906c9e69fb7a11d94875e7ced97bcd7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/f5697ab4cb14a5deed7473819e63141bf5352c36",
"reference": "f5697ab4cb14a5deed7473819e63141bf5352c36",
"url": "https://api.github.com/repos/symfony/process/zipball/bf9166bac906c9e69fb7a11d94875e7ced97bcd7",
"reference": "bf9166bac906c9e69fb7a11d94875e7ced97bcd7",
"shasum": ""
},
"require": {
@ -6364,11 +6364,11 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
"time": "2020-01-09T09:50:08+00:00"
"time": "2020-02-07T20:06:44+00:00"
},
{
"name": "symfony/property-access",
"version": "v5.0.4",
"version": "v5.0.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/property-access.git",
@ -6435,16 +6435,16 @@
},
{
"name": "symfony/routing",
"version": "v4.4.4",
"version": "v4.4.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
"reference": "7bf4e38573728e317b926ca4482ad30470d0e86a"
"reference": "4124d621d0e445732520037f888a0456951bde8c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/routing/zipball/7bf4e38573728e317b926ca4482ad30470d0e86a",
"reference": "7bf4e38573728e317b926ca4482ad30470d0e86a",
"url": "https://api.github.com/repos/symfony/routing/zipball/4124d621d0e445732520037f888a0456951bde8c",
"reference": "4124d621d0e445732520037f888a0456951bde8c",
"shasum": ""
},
"require": {
@ -6507,20 +6507,20 @@
"uri",
"url"
],
"time": "2020-01-08T17:29:02+00:00"
"time": "2020-02-25T12:41:09+00:00"
},
{
"name": "symfony/serializer",
"version": "v5.0.4",
"version": "v5.0.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/serializer.git",
"reference": "a76fc03e125719ef4ce18522b2347bf103b698d0"
"reference": "4411e7356beda717880da28cdbd32b33c52bb894"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/serializer/zipball/a76fc03e125719ef4ce18522b2347bf103b698d0",
"reference": "a76fc03e125719ef4ce18522b2347bf103b698d0",
"url": "https://api.github.com/repos/symfony/serializer/zipball/4411e7356beda717880da28cdbd32b33c52bb894",
"reference": "4411e7356beda717880da28cdbd32b33c52bb894",
"shasum": ""
},
"require": {
@ -6589,7 +6589,7 @@
],
"description": "Symfony Serializer Component",
"homepage": "https://symfony.com",
"time": "2020-01-08T17:33:29+00:00"
"time": "2020-02-29T10:07:09+00:00"
},
{
"name": "symfony/service-contracts",
@ -6651,16 +6651,16 @@
},
{
"name": "symfony/translation",
"version": "v4.4.4",
"version": "v4.4.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
"reference": "f5d2ac46930238b30a9c2f1b17c905f3697d808c"
"reference": "0a19a77fba20818a969ef03fdaf1602de0546353"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/translation/zipball/f5d2ac46930238b30a9c2f1b17c905f3697d808c",
"reference": "f5d2ac46930238b30a9c2f1b17c905f3697d808c",
"url": "https://api.github.com/repos/symfony/translation/zipball/0a19a77fba20818a969ef03fdaf1602de0546353",
"reference": "0a19a77fba20818a969ef03fdaf1602de0546353",
"shasum": ""
},
"require": {
@ -6723,7 +6723,7 @@
],
"description": "Symfony Translation Component",
"homepage": "https://symfony.com",
"time": "2020-01-15T13:29:06+00:00"
"time": "2020-02-04T09:32:40+00:00"
},
{
"name": "symfony/translation-contracts",
@ -6784,16 +6784,16 @@
},
{
"name": "symfony/var-dumper",
"version": "v4.4.4",
"version": "v4.4.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
"reference": "46b53fd714568af343953c039ff47b67ce8af8d6"
"reference": "2572839911702b0405479410ea7a1334bfab0b96"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/46b53fd714568af343953c039ff47b67ce8af8d6",
"reference": "46b53fd714568af343953c039ff47b67ce8af8d6",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/2572839911702b0405479410ea7a1334bfab0b96",
"reference": "2572839911702b0405479410ea7a1334bfab0b96",
"shasum": ""
},
"require": {
@ -6856,20 +6856,20 @@
"debug",
"dump"
],
"time": "2020-01-25T12:44:29+00:00"
"time": "2020-02-24T13:10:00+00:00"
},
{
"name": "symfony/yaml",
"version": "v4.4.4",
"version": "v4.4.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
"reference": "cd014e425b3668220adb865f53bff64b3ad21767"
"reference": "94d005c176db2080e98825d98e01e8b311a97a88"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/cd014e425b3668220adb865f53bff64b3ad21767",
"reference": "cd014e425b3668220adb865f53bff64b3ad21767",
"url": "https://api.github.com/repos/symfony/yaml/zipball/94d005c176db2080e98825d98e01e8b311a97a88",
"reference": "94d005c176db2080e98825d98e01e8b311a97a88",
"shasum": ""
},
"require": {
@ -6915,7 +6915,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
"time": "2020-01-21T11:12:16+00:00"
"time": "2020-02-03T10:46:43+00:00"
},
{
"name": "theiconic/php-ga-measurement-protocol",
@ -9574,7 +9574,7 @@
},
{
"name": "symfony/options-resolver",
"version": "v5.0.4",
"version": "v5.0.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/options-resolver.git",
@ -9687,7 +9687,7 @@
},
{
"name": "symfony/stopwatch",
"version": "v5.0.4",
"version": "v5.0.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/stopwatch.git",
@ -9834,6 +9834,7 @@
"ext-json": "*",
"ext-mbstring": "*",
"ext-simplexml": "*",
"ext-bcmath": "*",
"ext-pdo": "*"
},
"platform-dev": []