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

Correctly display 4D address when selecting area subscription

This commit is contained in:
Deon George 2023-07-19 16:51:40 +10:00
parent e1169335be
commit db37cc7aa4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/SystemController.php
View File

@ -299,14 +299,14 @@ class SystemController extends Controller
public function api_address(Request $request,System $o): Collection public function api_address(Request $request,System $o): Collection
{ {
return Address::select(['addresses.id','addresses.zone_id','region_id','host_id','node_id']) return Address::select(['addresses.id','addresses.zone_id','region_id','host_id','node_id','point_id'])
->leftjoin('zones',['zones.id'=>'addresses.zone_id']) ->leftjoin('zones',['zones.id'=>'addresses.zone_id'])
->where('addresses.system_id',$o->id) ->where('addresses.system_id',$o->id)
->where('zones.domain_id',$request->domain_id) ->where('zones.domain_id',$request->domain_id)
->withTrashed() ->withTrashed()
->FTNorder() ->FTNorder()
->get() ->get()
->map(function($item) { return ['id'=>(string)$item->id,'value'=>$item->ftn3d]; }); ->map(function($item) { return ['id'=>(string)$item->id,'value'=>$item->ftn4d]; });
} }
/** /**