diff --git a/app/Http/Requests/AddressMerge.php b/app/Http/Requests/AddressMerge.php index 69ad2da..39d19ff 100644 --- a/app/Http/Requests/AddressMerge.php +++ b/app/Http/Requests/AddressMerge.php @@ -36,7 +36,7 @@ class AddressMerge extends FormRequest $src = Address::withTrashed()->findOrFail($request->src); 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) { $dst = Address::withTrashed()->findOrFail($value); diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php index 302b7a4..79144f2 100644 --- a/resources/views/dashboard.blade.php +++ b/resources/views/dashboard.blade.php @@ -35,7 +35,7 @@ $user->load(['systems.akas.zone.domain.echoareas','systems.akas.echoareas']);

- {{ $x }} + $loop->index]) id="hd_{{ $x }}" data-bs-toggle="collapse" data-bs-target="#collapse_{{ $x }}" aria-expanded="true" aria-controls="collapse_{{ $x }}">{{ $x }}