bbs/clrghouz
1
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Fix for when no zones have been created yet in a domain

Browse Source
This commit is contained in:
Deon George 2024-05-29 18:59:44 +10:00
parent c414ebd053
commit 58adb63174
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/ZoneController.php
View File

@ -10,7 +10,7 @@ use App\Models\{Address,Zone};
class ZoneController extends Controller class ZoneController extends Controller
{ {
/** /**
* Add or edit a node * Add or edit a zone
*/ */
public function add_edit(Request $request,Zone $o) public function add_edit(Request $request,Zone $o)
{ {

4
app/Http/Requests/SystemRegisterRequest.php
View File

@ -8,12 +8,10 @@ use Illuminate\Support\Facades\Gate;
use Illuminate\Validation\Rule; use Illuminate\Validation\Rule;
use App\Classes\FTN\Packet; use App\Classes\FTN\Packet;
use App\Models\{Setup,System}; use App\Models\Setup;
class SystemRegisterRequest extends FormRequest class SystemRegisterRequest extends FormRequest
{ {
private System $so;
/** /**
* Determine if the user is authorized to make this request. * Determine if the user is authorized to make this request.
* *

3
app/Models/Domain.php
View File

@ -69,7 +69,8 @@ class Domain extends Model
public function getCanAcceptAppAttribute(): bool public function getCanAcceptAppAttribute(): bool
{ {
return our_address($this)->count() return ($x=our_address($this))
&& $x->count()
&& $this->active && $this->active
&& $this->accept_app && $this->accept_app
&& Auth::id() && Auth::id()

2
resources/views/domain/addedit.blade.php
View File

@ -47,7 +47,7 @@ use App\Models\Echoarea;
</div> </div>
<div class="col-2"> <div class="col-2">
@if ($o->zones->count() > 1) @if ($o->zones?->count() > 1)
<label class="form-label">Flatten Zones <i class="bi bi-info-circle" title="Treat this domain as a 2D domain"></i></label> <label class="form-label">Flatten Zones <i class="bi bi-info-circle" title="Treat this domain as a 2D domain"></i></label>
<div class="input-group"> <div class="input-group">
<div class="btn-group" role="group"> <div class="btn-group" role="group">