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

Make it easier to identify systems that have been marked not active
All checks were successful
Create Docker Image / Build Docker Image (x86_64) (push) Successful in 41s
Details
Create Docker Image / Build Docker Image (arm64) (push) Successful in 1m51s
Details
Create Docker Image / Final Docker Image Manifest (push) Successful in 10s
Details

Browse Source
This commit is contained in:
Deon George 2024-06-04 20:49:05 +10:00
parent e7821d4c80
commit f3c9c4b397
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
resources/views/system/home.blade.php
View File

@ -40,11 +40,12 @@ use App\Models\System;
<th>Address</th> <th>Address</th>
<th>ZeroTier ID</th> <th>ZeroTier ID</th>
<th>Addresses</th> <th>Addresses</th>
<th>Active</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@foreach (System::active()->with(['addresses.zone.domain'])->get() as $oo) @foreach (System::with(['addresses.zone.domain'])->get() as $oo)
<tr> <tr>
<td><a href="{{ url('system/addedit',[$oo->id]) }}" @cannot('update_nn',$oo)class="disabled" @endcannot>{{ $oo->id }}</a></td> <td><a href="{{ url('system/addedit',[$oo->id]) }}" @cannot('update_nn',$oo)class="disabled" @endcannot>{{ $oo->id }}</a></td>
<td>{{ $oo->name }} @if(! $oo->active)<span class="float-end"><small>[i]</small></span>@endif</td> <td>{{ $oo->name }} @if(! $oo->active)<span class="float-end"><small>[i]</small></span>@endif</td>
@ -61,6 +62,7 @@ use App\Models\System;
<td>{{ $oo->addresses->pluck('ftn')->join(', ') }}</td> <td>{{ $oo->addresses->pluck('ftn')->join(', ') }}</td>
<td>{{ $oo->zt_id }}</td> <td>{{ $oo->zt_id }}</td>
<td>{{ $oo->addresses->count() }}</td> <td>{{ $oo->addresses->count() }}</td>
<td>{{ $oo->active ? 'Active' : 'Not Active' }}</td>
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>
@ -94,15 +96,20 @@ use App\Models\System;
style: 'fade', style: 'fade',
speed: 500 // optional speed: 500 // optional
}, },
order: [1,'asc'],
orderFixed: [8,'asc'],
language: { language: {
paginate: { paginate: {
previous: '&lt;&lt;', previous: '&lt;&lt;',
next: '&gt;&gt;' next: '&gt;&gt;'
} }
}, },
rowGroup: {
dataSrc: [8],
},
columnDefs: [ columnDefs: [
{ {
targets: [5,6], targets: [5,6,8],
visible: false, visible: false,
} }
], ],

7
resources/views/system/ours.blade.php
View File

@ -31,7 +31,12 @@
@foreach (\App\Models\SystemZone::select('*')->with(['system.addresses.zone.domain','zone.domain'])->get() as $oo) @foreach (\App\Models\SystemZone::select('*')->with(['system.addresses.zone.domain','zone.domain'])->get() as $oo)
<tr> <tr>
<td>{{ $oo->zone->domain->name }}</td> <td>{{ $oo->zone->domain->name }}</td>
<td><a href="{{ url('system/addedit',[$oo->system_id]) }}">{{ $oo->system_id }}</a>@if($oo->system->hold)<span class="float-end"><i class="text-danger bi bi-stop-circle"></i></span>@endif</td> <td>
<a href="{{ url('system/addedit',[$oo->system_id]) }}">{{ $oo->system_id }}</a>
@if(! $oo->system->active)<span class="float-end"><i class="text-danger bi bi-slash-circle"></i></span>
@elseif($oo->system->hold)<span class="float-end"><i class="text-danger bi bi-stop-circle"></i></span>
@endif
</td>
<td>{{ $oo->system->name }}</td> <td>{{ $oo->system->name }}</td>
<td>{{ $oo->system->sysop }}</td> <td>{{ $oo->system->sysop }}</td>
<td>{{ $oo->system->location }}</td> <td>{{ $oo->system->location }}</td>