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

Minor debug packet cosmetic changes, Remove database/ items in docker build, Node address validation changes

Browse Source
This commit is contained in:
Deon George
2021-07-17 17:15:00 +10:00
parent 1fa566b26c
commit 066154f310
6 changed files with 57 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/HomeController.php
View File

@@ -87,11 +87,11 @@ class HomeController extends Controller
->rightjoin('systems',['systems.id'=>'addresses.system_id'])
->when($zone_id || $host_id || $node_id,function($query) use ($zone_id,$host_id,$node_id) {
return $query
->when($zone_id,function($q,$zone_id) { return $q->where('zones.zone_id','ilike','%'.$zone_id.'%'); })
->when($zone_id,function($q,$zone_id) { return $q->where('zones.zone_id',$zone_id); })
->where(function($q) use ($host_id) {
return $q
->when($host_id,function($q,$host_id) { return $q->where('region_id','ilike','%'.$host_id.'%'); })
->when($host_id,function($q,$host_id) { return $q->orWhere('host_id','ilike','%'.$host_id.'%'); });
->when($host_id,function($q,$host_id) { return $q->where('region_id',$host_id); })
->when($host_id,function($q,$host_id) { return $q->orWhere('host_id',$host_id); });
})
->when($node_id,function($q,$node_id) { return $q->where('node_id','ilike','%'.$node_id.'%'); });
})

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

@@ -144,8 +144,7 @@ class SystemController extends Controller
return $query
->where('host_id',$request->post('host_id'))
->where('node_id',$value)
->where('point_id',0)
->where('role',DomainController::NODE_RC);
->where('point_id',0);
});
if ($o->count()) {