Fixes for nodelist importing

This commit is contained in:
Deon George
2021-06-26 10:34:49 +10:00
parent 17a44a0945
commit aa06296963
8 changed files with 115 additions and 43 deletions

View File

@@ -56,7 +56,7 @@
<span class="input-group-text"><i class="bi bi-laptop-fill"></i></span>
<select class="form-select @error('system_id') is-invalid @enderror" id="system" name="system_id" required @cannot('admin',$o)disabled @endcannot>
<option value="">&nbsp;</option>
@foreach (\App\Models\System::active()->cursor() as $oo)
@foreach (\App\Models\System::active()->orderBy('name')->cursor() as $oo)
<option value="{{ $oo->id }}" @if(old('system_id',$o->system_id)==$oo->id)selected @endif>{{ $oo->name }}</option>
@endforeach
</select>

View File

@@ -38,12 +38,12 @@
</thead>
<tbody>
@foreach (\App\Models\Zone::with(['domain'])->get() as $oo)
@foreach (\App\Models\Zone::orderBy('zone_id')->with(['domain','addresses'])->get() as $oo)
<tr>
<td>{{ $oo->domain->name }}</td>
<td><a href="{{ url('ftn/zone/addedit',[$oo->id]) }}">{{ $oo->zone_id }}</a></td>
<td>{{ $oo->active ? 'YES' : 'NO' }}</td>
<td>-</td>
<td>{{ $oo->addresses->count() }}</td>
</tr>
@endforeach
</tbody>