Controller Permission

README.md

@@ -14,7 +14,7 @@
 
 - BelongsTo AircraftType
 - BelongsToMany AircraftTypeGroup
-- **TODO** BelongsTo Airport (External DB)
+- BelongsTo Airport (2x, External DB, creation in Routes Plugin)
 
 ## AircraftTypeGroup
 

controllers/Aircraft.php

@@ -1,7 +1,6 @@
 <?php namespace GermanAirlinesVa\Fleet\Controllers;
 
 use Backend\Classes\Controller;
-use BackendMenu;
 
 class Aircraft extends Controller
 {
@@ -10,6 +9,8 @@ class Aircraft extends Controller
   public $listConfig = 'config_list.yaml';
   public $formConfig = 'config_form.yaml';
 
+  public $requiredPermissions = ['germanairlinesva.fleet.master'];
+
   public function __construct()
   {
     parent::__construct();

controllers/AircraftManufacturer.php

@@ -1,7 +1,6 @@
 <?php namespace GermanAirlinesVa\Fleet\Controllers;
 
 use Backend\Classes\Controller;
-use BackendMenu;
 
 class AircraftManufacturer extends Controller
 {
@@ -10,6 +9,8 @@ class AircraftManufacturer extends Controller
   public $listConfig = 'config_list.yaml';
   public $formConfig = 'config_form.yaml';
 
+  public $requiredPermissions = ['germanairlinesva.fleet.master'];
+
   public function __construct()
   {
     parent::__construct();

controllers/AircraftType.php

@@ -1,7 +1,6 @@
 <?php namespace GermanAirlinesVa\Fleet\Controllers;
 
 use Backend\Classes\Controller;
-use BackendMenu;
 
 class AircraftType extends Controller
 {
@@ -10,6 +9,8 @@ class AircraftType extends Controller
   public $listConfig = 'config_list.yaml';
   public $formConfig = 'config_form.yaml';
 
+  public $requiredPermissions = ['germanairlinesva.fleet.master'];
+
   public function __construct()
   {
     parent::__construct();

controllers/AircraftTypeGroup.php

@@ -1,7 +1,6 @@
 <?php namespace GermanAirlinesVa\Fleet\Controllers;
 
 use Backend\Classes\Controller;
-use BackendMenu;
 
 class AircraftTypeGroup extends Controller
 {
@@ -10,6 +9,8 @@ class AircraftTypeGroup extends Controller
   public $listConfig = 'config_list.yaml';
   public $formConfig = 'config_form.yaml';
 
+  public $requiredPermissions = ['germanairlinesva.fleet.master'];
+
   public function __construct()
   {
     parent::__construct();

models/Aircraft.php

@@ -33,5 +33,7 @@ class Aircraft extends Model
 
   public $belongsTo = [
     'aircraft_type' => 'GermanAirlinesVa\Fleet\Models\AircraftType',
+    'home_airport' => 'GermanAirlinesVa\Routes\Models\Airport',
+    'airport' => 'GermanAirlinesVa\Routes\Models\Airport',
   ];
 }

models/aircraft/columns.yaml

@@ -2,15 +2,21 @@ columns:
   id:
     label: id
     type: text
-  aircraft_type_id:
+  aircraft_type:
-    label: aircraft_type_id
+    label: aircraft_type
     type: text
-  home_airport_id:
+    relation: aircraft_type
-    label: home_airport_id
+    valueFrom: type
+  home_airport:
+    label: home_airport
     type: text
-  airport_id:
+    relation: home_airport
-    label: airport_id
+    valueFrom: icao
+  airport:
+    label: airport
     type: text
+    relation: airport
+    valueFrom: icao
   name:
     label: name
     type: text

models/aircraft/fields.yaml

@@ -16,8 +16,10 @@ fields:
     span: auto
     required: 1
     type: text
-  home_airport_id:
+  home_airport:
     label: 'germanairlinesva.fleet::lang.aircrafts.home_base'
+    nameFrom: icao
+    descriptionFrom: description
     span: auto
     required: 1
-    type: number
+    type: relation

package.json

@@ -1,8 +1,8 @@
 {
-  "name": "graphql",
+  "name": "fleet",
   "version": "1.0.0",
   "main": "Plugin.php",
-  "repository": "https://git.hofmannnet.myhome-server.de/GermanAirlines/GermanAirlinesVA-GraphQL.git",
+  "repository": "https://git.hofmannnet.myhome-server.de/GermanAirlines/GermanAirlinesVA-Fleet.git",
   "author": "German Airlines VA",
   "license": "MIT",
   "devDependencies": {
@@ -11,6 +11,6 @@
   },
   "scripts": {
     "preinstall": "git config core.hooksPath .hooks",
-    "format": "prettier --write './**/*.{php,html,htm,yaml}'"
+    "format": "prettier --write './**/*.{php,html,yaml}'"
   }
 }

plugin.yaml

@@ -10,7 +10,7 @@ navigation:
     url: /
     icon: icon-plane
     permissions:
-      - fleet
+      - germanairlinesva.fleet.master
     sideMenu:
       side-menu-item:
         label: 'germanairlinesva.fleet::lang.menu.groups'
@@ -29,6 +29,6 @@ navigation:
         url: germanairlinesva/fleet/aircraft
         icon: icon-plane
 permissions:
-  fleet:
+  germanairlinesva.fleet.master:
     tab: 'germanairlinesva.fleet::lang.permissions.tab.fleet'
     label: 'germanairlinesva.fleet::lang.permissions.label.fleet'

updates/builder_table_create_aircraft_manufacturers.php

@@ -1,6 +1,5 @@
 <?php namespace GermanAirlinesVa\Fleet\Updates;
 
-use Config;
 use Schema;
 use October\Rain\Database\Updates\Migration;
 

updates/builder_table_create_aircraft_types.php

@@ -1,6 +1,5 @@
 <?php namespace GermanAirlinesVa\Fleet\Updates;
 
-use Config;
 use Schema;
 use October\Rain\Database\Updates\Migration;
 

updates/builder_table_create_aircrafts.php

@@ -1,4 +1,5 @@
 <?php namespace GermanAirlinesVa\Fleet\Updates;
+
 use DB;
 use Schema;
 use October\Rain\Database\Updates\Migration;
@@ -16,18 +17,10 @@ class BuilderTableCreateGermanAirlinesVaFleetAircrafts extends Migration
         ->references('id')
         ->on('aircraft_types');
       $table->bigInteger('home_airport_id')->unsigned();
-      //$table
-      //  ->foreign('home_airport_id')
-      //  ->references('id')
-      //  ->on('airports');
       $table
         ->bigInteger('airport_id')
         ->unsigned()
         ->nullable();
-      //$table
-      //  ->foreign('airport_id')
-      //  ->references('id')
-      //  ->on('airports');
       $table->string('name');
       $table->string('registration');
       $table->boolean('in_use')->default(true);

updates/builder_table_create_deferred_bindings.php

@@ -1,6 +1,5 @@
 <?php namespace GermanAirlinesVa\Fleet\Updates;
 
-use Config;
 use Schema;
 use October\Rain\Database\Updates\Migration;
 

yarn.lock

@@ -41,9 +41,9 @@ p-defer@^1.0.0:
   resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
   integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=
 
-"php-parser@git+https://github.com/glayzzle/php-parser.git#e61e26102144f267ecf5e09020865a9baa6ca2f1":
+"php-parser@https://github.com/glayzzle/php-parser#e61e26102144f267ecf5e09020865a9baa6ca2f1":
   version "3.0.2"
-  resolved "git+https://github.com/glayzzle/php-parser.git#e61e26102144f267ecf5e09020865a9baa6ca2f1"
+  resolved "https://github.com/glayzzle/php-parser#e61e26102144f267ecf5e09020865a9baa6ca2f1"
 
 prettier@^2.3.0:
   version "2.3.2"