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

Show correct zone_id in echoarea/filearea selection

Browse Source
This commit is contained in:
Deon George 2023-07-29 20:50:56 +10:00
parent 7f144c3420
commit df559b6b39
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
resources/views/system/form-echoarea.blade.php
View File

@ -1,7 +1,6 @@
@if(($x=\App\Models\Domain::active() @if(($x=\App\Models\Zone::active()
->select('domains.*') ->whereIn('id',$o->sessions->pluck('pivot.zone_id'))
->join('zones',['zones.domain_id'=>'domains.id']) ->orderBy('zone_id')
->whereIn('zones.id',$o->sessions->pluck('pivot.zone_id'))
->get())->count()) ->get())->count())
<form class="row g-0 needs-validation" method="post" action="{{ url('ftn/system/echoarea',$o->id) }}" novalidate> <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> <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> <select class="form-select @error('domain_id') is-invalid @enderror" id="echoarea_domain_id" name="domain_id" required>
<option></option> <option></option>
@foreach($x as $do) @foreach($x as $zo)
<option value="{{ $do->id }}" @if(old('domain_id') == $do->id)selected @endif>{{ $do->id }} <small>({{ $do->name }})</small></option> <option value="{{ $zo->domain_id }}" @if(old('domain_id') == $zo->domain_id)selected @endif>{{ $zo->zone_id }} <small>({{ $zo->domain->name }})</small></option>
@endforeach @endforeach
</select> </select>
<span class="invalid-feedback" role="alert"> <span class="invalid-feedback" role="alert">

11
resources/views/system/form-filearea.blade.php
View File

@ -1,7 +1,6 @@
@if(($x=\App\Models\Domain::active() @if(($x=\App\Models\Zone::active()
->select('domains.*') ->whereIn('id',$o->sessions->pluck('pivot.zone_id'))
->join('zones',['zones.domain_id'=>'domains.id']) ->orderBy('zone_id')
->whereIn('zones.id',$o->sessions->pluck('pivot.zone_id'))
->get())->count()) ->get())->count())
<form class="row g-0 needs-validation" method="post" action="{{ url('ftn/system/filearea',$o->id) }}" novalidate> <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> <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> <select class="form-select @error('domain_id') is-invalid @enderror" id="filearea_domain_id" name="domain_id" required>
<option></option> <option></option>
@foreach($x as $do) @foreach($x as $zo)
<option value="{{ $do->id }}" @if(old('domain_id') == $do->id)selected @endif>{{ $do->id }} <small>({{ $do->name }})</small></option> <option value="{{ $zo->domain_id }}" @if(old('domain_id') == $zo->domain_id)selected @endif>{{ $zo->zone_id }} <small>({{ $zo->domain->name }})</small></option>
@endforeach @endforeach
</select> </select>
<span class="invalid-feedback" role="alert"> <span class="invalid-feedback" role="alert">