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

Presentation fixes, no functional changes
All checks were successful
Create Docker Image / Build Docker Image (x86_64) (push) Successful in 34s
Details
Create Docker Image / Build Docker Image (arm64) (push) Successful in 1m49s
Details
Create Docker Image / Final Docker Image Manifest (push) Successful in 9s
Details

Browse Source
This commit is contained in:
Deon George 2024-10-20 11:49:52 +11:00
parent 432a9bbf2b
commit 676ba4a40b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Requests/AddressMerge.php
View File

@ -36,7 +36,7 @@ class AddressMerge extends FormRequest
$src = Address::withTrashed()->findOrFail($request->src); $src = Address::withTrashed()->findOrFail($request->src);
if ((! $dst->active) && ($dst->system_id !== $src->system_id) && ($src->system->name !== System::default)) if ((! $dst->active) && ($dst->system_id !== $src->system_id) && ($src->system->name !== System::default))
$fail('Destination must be active, or be from the system system'); $fail('Destination must be active, or be from the same system');
}, },
function ($attribute,$value,$fail) use ($request) { function ($attribute,$value,$fail) use ($request) {
$dst = Address::withTrashed()->findOrFail($value); $dst = Address::withTrashed()->findOrFail($value);

2
resources/views/dashboard.blade.php
View File

@ -35,7 +35,7 @@ $user->load(['systems.akas.zone.domain.echoareas','systems.akas.echoareas']);
<!-- {{ $x=$list->first()->domain->name }} --> <!-- {{ $x=$list->first()->domain->name }} -->
<div class="accordion-item"> <div class="accordion-item">
<h3 class="accordion-header"> <h3 class="accordion-header">
<span class="accordion-button" id="hd_{{ $x }}" data-bs-toggle="collapse" data-bs-target="#collapse_{{ $x }}" aria-expanded="true" aria-controls="collapse_{{ $x }}">{{ $x }}</span> <span @class(['accordion-button','collapsed'=>$loop->index]) id="hd_{{ $x }}" data-bs-toggle="collapse" data-bs-target="#collapse_{{ $x }}" aria-expanded="true" aria-controls="collapse_{{ $x }}">{{ $x }}</span>
</h3> </h3>
<div id="collapse_{{ $x }}" class="accordion-collapse {{ ($loop->index) ? 'collapse' : 'show' }}" aria-labelledby="{{ $x }}" data-bs-parent="#accordion_details"> <div id="collapse_{{ $x }}" class="accordion-collapse {{ ($loop->index) ? 'collapse' : 'show' }}" aria-labelledby="{{ $x }}" data-bs-parent="#accordion_details">