From df559b6b39655d5b452a0bf0ecf557a55f47c4e4 Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
Date: Sat, 29 Jul 2023 20:50:56 +1000
Subject: [PATCH] Show correct zone_id in echoarea/filearea selection

---
 resources/views/system/form-echoarea.blade.php | 11 +++++------
 resources/views/system/form-filearea.blade.php | 11 +++++------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/resources/views/system/form-echoarea.blade.php b/resources/views/system/form-echoarea.blade.php
index 9c44ab5..cc0041d 100644
--- a/resources/views/system/form-echoarea.blade.php
+++ b/resources/views/system/form-echoarea.blade.php
@@ -1,7 +1,6 @@
-@if(($x=\App\Models\Domain::active()
-	->select('domains.*')
-	->join('zones',['zones.domain_id'=>'domains.id'])
-	->whereIn('zones.id',$o->sessions->pluck('pivot.zone_id'))
+@if(($x=\App\Models\Zone::active()
+	->whereIn('id',$o->sessions->pluck('pivot.zone_id'))
+	->orderBy('zone_id')
 	->get())->count())
 
 	<form class="row g-0 needs-validation" method="post" action="{{ url('ftn/system/echoarea',$o->id) }}" novalidate>
@@ -18,8 +17,8 @@
 								<span class="input-group-text"><i class="bi bi-hash"></i></span>
 								<select class="form-select @error('domain_id') is-invalid @enderror" id="echoarea_domain_id" name="domain_id" required>
 									<option></option>
-									@foreach($x as $do)
-										<option value="{{ $do->id }}" @if(old('domain_id') == $do->id)selected @endif>{{ $do->id }} <small>({{ $do->name }})</small></option>
+									@foreach($x as $zo)
+										<option value="{{ $zo->domain_id }}" @if(old('domain_id') == $zo->domain_id)selected @endif>{{ $zo->zone_id }} <small>({{ $zo->domain->name }})</small></option>
 									@endforeach
 								</select>
 								<span class="invalid-feedback" role="alert">
diff --git a/resources/views/system/form-filearea.blade.php b/resources/views/system/form-filearea.blade.php
index 22e228e..a46e1f4 100644
--- a/resources/views/system/form-filearea.blade.php
+++ b/resources/views/system/form-filearea.blade.php
@@ -1,7 +1,6 @@
-@if(($x=\App\Models\Domain::active()
-	->select('domains.*')
-	->join('zones',['zones.domain_id'=>'domains.id'])
-	->whereIn('zones.id',$o->sessions->pluck('pivot.zone_id'))
+@if(($x=\App\Models\Zone::active()
+	->whereIn('id',$o->sessions->pluck('pivot.zone_id'))
+	->orderBy('zone_id')
 	->get())->count())
 
 	<form class="row g-0 needs-validation" method="post" action="{{ url('ftn/system/filearea',$o->id) }}" novalidate>
@@ -18,8 +17,8 @@
 								<span class="input-group-text"><i class="bi bi-hash"></i></span>
 								<select class="form-select @error('domain_id') is-invalid @enderror" id="filearea_domain_id" name="domain_id" required>
 									<option></option>
-									@foreach($x as $do)
-										<option value="{{ $do->id }}" @if(old('domain_id') == $do->id)selected @endif>{{ $do->id }} <small>({{ $do->name }})</small></option>
+									@foreach($x as $zo)
+										<option value="{{ $zo->domain_id }}" @if(old('domain_id') == $zo->domain_id)selected @endif>{{ $zo->zone_id }} <small>({{ $zo->domain->name }})</small></option>
 									@endforeach
 								</select>
 								<span class="invalid-feedback" role="alert">