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

Ensure children() returns addresses in FTN order
All checks were successful
Create Docker Image / Build Docker Image (x86_64) (push) Successful in 37s
Details
Create Docker Image / Build Docker Image (arm64) (push) Successful in 1m36s
Details
Create Docker Image / Final Docker Image Manifest (push) Successful in 10s
Details

Browse Source
This commit is contained in:
Deon George 2024-12-01 16:31:07 +11:00
parent 445dd48c81
commit e1ed446f3e
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Models/Address.php
View File

@ -427,17 +427,13 @@ class Address extends Model
->join('zones',['zones.id'=>'addresses.zone_id']) ->join('zones',['zones.id'=>'addresses.zone_id'])
->join('domains',['domains.id'=>'zones.domain_id']) ->join('domains',['domains.id'=>'zones.domain_id'])
->orderBy('domains.name') ->orderBy('domains.name')
->orderBy('region_id') ->FTNorder()
->orderBy('host_id')
->orderBy('node_id')
->orderBy('point_id')
->with([ ->with([
'zone:zones.id,domain_id,zone_id,active', 'zone:zones.id,domain_id,zone_id,active',
'zone.domain:domains.id,name,active,public', 'zone.domain:domains.id,name,active,public',
]); ]);
} }
/** @deprecated use FTN() */
public function scopeFTNOrder($query) public function scopeFTNOrder($query)
{ {
return $query return $query
@ -971,6 +967,7 @@ class Address extends Model
->where('host_id',$this->host_id) ->where('host_id',$this->host_id)
->where('hub_id',$this->id) ->where('hub_id',$this->id)
->where('id','<>',$this->id) ->where('id','<>',$this->id)
->FTNorder()
->get(); ->get();
// Need to add in points of this hub's nodes // Need to add in points of this hub's nodes
@ -981,6 +978,7 @@ class Address extends Model
->where('host_id',$this->host_id) ->where('host_id',$this->host_id)
->whereIn('node_id',$o->pluck('node_id')) ->whereIn('node_id',$o->pluck('node_id'))
->where('point_id','<>',0) ->where('point_id','<>',0)
->FTNorder()
->get() ->get()
); );
@ -1011,6 +1009,7 @@ class Address extends Model
return $o return $o
->where('id','<>',$this->id) ->where('id','<>',$this->id)
->FTNorder()
->get(); ->get();
} }