diff --git a/app/Classes/FTN/Tic.php b/app/Classes/FTN/Tic.php index 78ce544..1216c44 100644 --- a/app/Classes/FTN/Tic.php +++ b/app/Classes/FTN/Tic.php @@ -272,7 +272,7 @@ class Tic extends FTNBase if (! $this->area->exists) { $this->area->description = $areadesc; $this->area->active = TRUE; - $this->area->public = FALSE; + $this->area->show = FALSE; $this->area->notes = 'Autocreated'; $this->area->domain_id = $this->from->zone->domain_id; $this->area->save(); diff --git a/app/Http/Controllers/EchoareaController.php b/app/Http/Controllers/EchoareaController.php index 9099a13..b392162 100644 --- a/app/Http/Controllers/EchoareaController.php +++ b/app/Http/Controllers/EchoareaController.php @@ -21,10 +21,10 @@ class EchoareaController extends Controller 'name' => 'required|min:4|max:35|regex:/^[a-zA-Z-_~]{4,}$/|unique:echoareas,name,'.($o->exists ? $o->id : 0), 'description' => 'required', 'active' => 'required|boolean', - 'public' => 'required|boolean', + 'show' => 'required|boolean', ]); - foreach (['name','description','active','public','notes','domain_id'] as $key) + foreach (['name','description','active','show','notes','domain_id'] as $key) $o->{$key} = $request->post($key); $o->save(); diff --git a/app/Http/Controllers/FileareaController.php b/app/Http/Controllers/FileareaController.php index 0e9c79d..72079ec 100644 --- a/app/Http/Controllers/FileareaController.php +++ b/app/Http/Controllers/FileareaController.php @@ -20,11 +20,11 @@ class FileareaController extends Controller 'name' => 'required|min:4|max:35|regex:/^[a-zA-Z-_~]{4,}$/|unique:fileareas,name,'.($o->exists ? $o->id : 0), 'description' => 'required', 'active' => 'required|boolean', - 'public' => 'required|boolean', + 'show' => 'required|boolean', 'nodelist' => 'nullable|string|max:12' ]); - foreach (['name','description','active','public','notes','domain_id'] as $key) + foreach (['name','description','active','show','notes','domain_id'] as $key) $o->{$key} = $request->post($key); $o->save(); diff --git a/app/Jobs/EchoareaImport.php b/app/Jobs/EchoareaImport.php index c9ddf3d..38a240a 100644 --- a/app/Jobs/EchoareaImport.php +++ b/app/Jobs/EchoareaImport.php @@ -84,7 +84,7 @@ class EchoareaImport implements ShouldQueue $o->name = $area; $o->description = ($this->prefix ?: '').$description; $o->active = TRUE; - $o->public = TRUE; + $o->show = TRUE; $this->do->echoareas()->save($o); } diff --git a/app/Models/Domain.php b/app/Models/Domain.php index d286ff7..b3b10ad 100644 --- a/app/Models/Domain.php +++ b/app/Models/Domain.php @@ -102,6 +102,7 @@ class Domain extends Model ]; })->values(), 'dashStyle' => 'ShortDot', + 'visible'=>(bool)$item->first()->echoarea->show, ]; })->values(); diff --git a/database/seeders/InitialSetupSeeder.php b/database/seeders/InitialSetupSeeder.php index 43694d6..93789fa 100644 --- a/database/seeders/InitialSetupSeeder.php +++ b/database/seeders/InitialSetupSeeder.php @@ -77,7 +77,7 @@ class InitialSetupSeeder extends Seeder 'name'=>'-BAD_AREA', 'description'=>'Inbound invalid echomail', 'active'=>TRUE, - 'public'=>TRUE, + 'show'=>TRUE, 'domain_id'=>$do->id, ]); @@ -85,7 +85,7 @@ class InitialSetupSeeder extends Seeder 'name'=>'-BAD_AREA', 'description'=>'Inbound invalid files', 'active'=>TRUE, - 'public'=>TRUE, + 'show'=>TRUE, 'domain_id'=>$do->id, ]); } diff --git a/resources/views/domain/view.blade.php b/resources/views/domain/view.blade.php index 2ffb50f..4d71175 100644 --- a/resources/views/domain/view.blade.php +++ b/resources/views/domain/view.blade.php @@ -1,3 +1,4 @@ + @extends('layouts.app') @section('htmlheader_title') {{ $o->name }} diff --git a/resources/views/echoarea/addedit.blade.php b/resources/views/echoarea/addedit.blade.php index fe3181d..a907524 100644 --- a/resources/views/echoarea/addedit.blade.php +++ b/resources/views/echoarea/addedit.blade.php @@ -64,14 +64,14 @@
- +
- public ?? TRUE))checked @endif> - + show ?? TRUE))checked @endif> + - public ?? TRUE))checked @endif> - + show ?? TRUE))checked @endif> +
diff --git a/resources/views/filearea/addedit.blade.php b/resources/views/filearea/addedit.blade.php index 498948e..def4419 100644 --- a/resources/views/filearea/addedit.blade.php +++ b/resources/views/filearea/addedit.blade.php @@ -65,14 +65,14 @@
- +
- public ?? TRUE))checked @endif> - + show ?? TRUE))checked @endif> + - public ?? TRUE))checked @endif> - + show ?? TRUE))checked @endif> +