Enable merging address in a domain that has flatten set

2023-09-11 22:57:29 +10:00
parent ab7f661800
commit e553bb4ce6
3 changed files with 14 additions and 2 deletions
--- a/app/Http/Controllers/SystemController.php
+++ b/app/Http/Controllers/SystemController.php
@@ -386,6 +386,15 @@ class SystemController extends Controller
 			->where('point_id',$o->point_id)
 			->get();

+		if ($o->zone->domain->flatten)
+			$oo = $oo->merge(Address::withTrashed()
+				->whereIn('zone_id',$o->zone->domain->zones->pluck('id'))
+				->where('host_id',$o->host_id)
+				->where('node_id',$o->node_id)
+				->where('point_id',$o->point_id)
+				->get()
+			);
+
 		return view('system/address-merge')
 			->with('o',$o)
 			->with('oo',$oo);