Skip to content

Commit 6635482

Browse files
dbarzindbarzin
authored
Merge pull request #1725 from dbarzin/dev
Dev
2 parents a159933 + 9010b86 commit 6635482

File tree

3 files changed

+96
-96
lines changed

3 files changed

+96
-96
lines changed

‎app/Http/Controllers/Report/LogicalInfrastructureView.php‎

Lines changed: 41 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -73,19 +73,19 @@ public function generate(Request $request): View|RedirectResponse
7373
$request->session()->put('show_ip', null);
7474
}
7575

76-
$all_networks = Network::All()->sortBy('name')->pluck('name', 'id');
76+
$all_networks = Network::query()->orderBy('name')->pluck('name', 'id');
7777
if ($network !== null) {
78-
$all_subnetworks = Subnetwork::All()->sortBy('name')
78+
$all_subnetworks = Subnetwork::query()->orderBy('name')
7979
->where('network_id', '=', $network)->pluck('name', 'id');
8080

81-
$networks = Network::All()->sortBy('name')->where('id', '=', $network);
81+
$networks = Network::query()->orderBy('name')->where('id', '=', $network)->get();
8282

8383
$externalConnectedEntities = ExternalConnectedEntity::where('network_id', '=', $network)
8484
->orderBy('name')->get();
8585

8686
if ($subnetwork === null) {
87-
$subnetworks = Subnetwork::All()->sortBy('name')
88-
->where('network_id', '=', $network);
87+
$subnetworks = Subnetwork::query()->orderBy('name')
88+
->where('network_id', '=', $network)->get();
8989
} else {
9090
$root = Subnetwork::find($subnetwork);
9191
if ($root !== null) {
@@ -109,7 +109,7 @@ public function generate(Request $request): View|RedirectResponse
109109
}
110110

111111
// Get Gateways
112-
$gateways = Gateway::All()->sortBy('name')
112+
$gateways = Gateway::query()->orderBy('name')->get()
113113
->filter(function ($item) use ($subnetworks) {
114114
foreach ($subnetworks as $subnetwork) {
115115
if ($subnetwork->gateway_id === $item->id) {
@@ -121,13 +121,13 @@ public function generate(Request $request): View|RedirectResponse
121121
});
122122

123123
// Get VLANS
124-
$vlans = Vlan::All()->sortBy('name')
124+
$vlans = Vlan::query()->orderBy('name')->get()
125125
->filter(function ($item) use ($subnetworks) {
126126
return $subnetworks->pluck('vlan_id')->contains($item->id);
127127
});
128128

129129
// Get NetworkSwitches
130-
$networkSwitches = NetworkSwitch::All()->sortBy('name')
130+
$networkSwitches = NetworkSwitch::query()->orderBy('name')->get()
131131
->filter(function ($item) use ($subnetworks, $vlans) {
132132
if ($item->vlans()->count() > 0) {
133133
foreach ($item->vlans as $v) {
@@ -149,7 +149,7 @@ public function generate(Request $request): View|RedirectResponse
149149
});
150150

151151
// Get Workstations
152-
$workstations = Workstation::All()->sortBy('name')
152+
$workstations = Workstation::query()->orderBy('name')->get()
153153
->filter(function ($item) use ($subnetworks) {
154154
foreach (explode(',', $item->address_ip) as $ip) {
155155
foreach ($subnetworks as $subnetwork) {
@@ -163,7 +163,7 @@ public function generate(Request $request): View|RedirectResponse
163163
});
164164

165165
// Get WifiTerminals
166-
$wifiTerminals = WifiTerminal::All()->sortBy('name')
166+
$wifiTerminals = WifiTerminal::query()->orderBy('name')->get()
167167
->filter(function ($item) use ($subnetworks) {
168168
foreach (explode(',', $item->address_ip) as $ip) {
169169
foreach ($subnetworks as $subnetwork) {
@@ -177,7 +177,7 @@ public function generate(Request $request): View|RedirectResponse
177177
});
178178

179179
// Get Phones
180-
$phones = Phone::All()->sortBy('name')
180+
$phones = Phone::query()->orderBy('name')->get()
181181
->filter(function ($item) use ($subnetworks) {
182182
foreach (explode(',', $item->address_ip) as $ip) {
183183
foreach ($subnetworks as $subnetwork) {
@@ -191,7 +191,7 @@ public function generate(Request $request): View|RedirectResponse
191191
});
192192

193193
// Get peripherals
194-
$peripherals = Peripheral::All()->sortBy('name')
194+
$peripherals = Peripheral::query()->orderBy('name')->get()
195195
->filter(function ($item) use ($subnetworks) {
196196
foreach (explode(',', $item->address_ip) as $ip) {
197197
foreach ($subnetworks as $subnetwork) {
@@ -205,7 +205,7 @@ public function generate(Request $request): View|RedirectResponse
205205
});
206206

207207
// Get Physical Security Devices
208-
$physicalSecurityDevices = PhysicalSecurityDevice::All()->sortBy('name')
208+
$physicalSecurityDevices = PhysicalSecurityDevice::query()->orderBy('name')->get()
209209
->filter(function ($item) use ($subnetworks) {
210210
foreach (explode(',', $item->address_ip) as $ip) {
211211
foreach ($subnetworks as $subnetwork) {
@@ -219,7 +219,7 @@ public function generate(Request $request): View|RedirectResponse
219219
});
220220

221221
// Get routers
222-
$routers = Router::All()->sortBy('name')
222+
$routers = Router::query()->orderBy('name')->get()
223223
->filter(function ($item) use ($subnetworks) {
224224
foreach (explode(',', $item->ip_addresses) as $ip) {
225225
foreach ($subnetworks as $subnetwork) {
@@ -271,7 +271,7 @@ public function generate(Request $request): View|RedirectResponse
271271
});
272272

273273
// Get DNS Servers
274-
$dnsservers = Dnsserver::All()->sortBy('name')
274+
$dnsservers = Dnsserver::query()->orderBy('name')->get()
275275
->filter(function ($item) use ($subnetworks) {
276276
foreach ($subnetworks as $subnetwork) {
277277
// foreach (explode(',', $item->address_ip) as $address) {
@@ -284,10 +284,10 @@ public function generate(Request $request): View|RedirectResponse
284284
return false;
285285
});
286286

287-
$clusters = Cluster::All()->sortBy('name');
287+
$clusters = Cluster::query()->orderBy('name')->get();
288288

289289
// Get Logical serveurs
290-
$logicalServers = LogicalServer::All()->sortBy('name')
290+
$logicalServers = LogicalServer::query()->orderBy('name')->get()
291291
->filter(function ($item) use ($subnetworks) {
292292
foreach ($subnetworks as $subnetwork) {
293293
foreach (explode(',', $item->address_ip) as $address) {
@@ -301,7 +301,7 @@ public function generate(Request $request): View|RedirectResponse
301301
});
302302

303303
// Get Certificates
304-
$certificates = Certificate::All()->load('logical_servers')->sortBy('name')
304+
$certificates = Certificate::query()->with('logical_servers')->orderBy('name')->get()
305305
->filter(function ($item) use ($logicalServers) {
306306
foreach ($logicalServers as $logical_server) {
307307
foreach ($logical_server->certificates as $cert) {
@@ -315,7 +315,7 @@ public function generate(Request $request): View|RedirectResponse
315315
});
316316

317317
// Get Containers
318-
$containers = Container::All()->load('logicalServers')->sortBy('name')
318+
$containers = Container::query()->with('logicalServers')->orderBy('name')->get()
319319
->filter(function ($item) use ($logicalServers) {
320320
foreach ($logicalServers as $logical_server) {
321321
foreach ($logical_server->containers as $container) {
@@ -329,29 +329,30 @@ public function generate(Request $request): View|RedirectResponse
329329
});
330330

331331
} else {
332-
$all_subnetworks = Subnetwork::All()->sortBy('name')->pluck('name', 'id');
332+
$all_subnetworks = Subnetwork::query()->orderBy('name')->pluck('name', 'id');
333333

334334
// all
335-
$networks = Network::All()->sortBy('name');
336-
$subnetworks = Subnetwork::All()->sortBy('name');
337-
$gateways = Gateway::All()->sortBy('name');
338-
$externalConnectedEntities = ExternalConnectedEntity::All()->sortBy('name');
339-
$networkSwitches = NetworkSwitch::All()->sortBy('name');
340-
$workstations = Workstation::All()->sortBy('name');
341-
$wifiTerminals = WifiTerminal::All()->sortBy('name');
342-
$phones = Phone::All()->sortBy('name');
343-
$physicalSecurityDevices = PhysicalSecurityDevice::All()->sortBy('name');
344-
$peripherals = Peripheral::All()->sortBy('name');
345-
$routers = Router::All()->sortBy('name');
346-
$securityDevices = SecurityDevice::All()->sortBy('name');
347-
$storageDevices = StorageDevice::All()->sortBy('name');
348-
$dhcpServers = DhcpServer::All()->sortBy('name');
349-
$dnsservers = Dnsserver::All()->sortBy('name');
350-
$clusters = Cluster::All()->sortBy('name');
351-
$logicalServers = LogicalServer::All()->sortBy('name');
352-
$containers = Container::All()->sortBy('name');
353-
$certificates = Certificate::All()->sortBy('name');
354-
$vlans = Vlan::All()->sortBy('name');
335+
$networks = Network::query()->orderBy('name')->get();
336+
$subnetworks = Subnetwork::query()->orderBy('name')->get();
337+
$gateways = Gateway::query()->orderBy('name')->get();
338+
$externalConnectedEntities = ExternalConnectedEntity::query()->orderBy('name')->get();
339+
$networkSwitches = NetworkSwitch::query()->orderBy('name')->get();
340+
$workstations = Workstation::query()->orderBy('name')->with('site','building')->get();
341+
$wifiTerminals = WifiTerminal::query()->orderBy('name')->with('site','building')->get();
342+
$phones = Phone::query()->orderBy('name')->with('site','building')->get();
343+
$physicalSecurityDevices = PhysicalSecurityDevice::query()->orderBy('name')->with('site','building')->get();
344+
$peripherals = Peripheral::query()->orderBy('name')->with('site','building','bay')->get();
345+
$routers = Router::query()->orderBy('name')->get();
346+
$securityDevices = SecurityDevice::query()->orderBy('name')->get();
347+
$storageDevices = StorageDevice::query()->orderBy('name')->with('site','building','bay')->get();
348+
$dhcpServers = DhcpServer::query()->orderBy('name')->get();
349+
$dnsservers = Dnsserver::query()->orderBy('name')->get();
350+
$clusters = Cluster::query()->orderBy('name')->get();
351+
$logicalServers = LogicalServer::query()->orderBy('name')->get();
352+
$containers = Container::query()->orderBy('name')->get();
353+
$certificates = Certificate::query()->orderBy('name')->get();
354+
$vlans = Vlan::query()->orderBy('name')->with('subnetworks')->get();
355+
355356
}
356357

357358
return view(

‎resources/views/admin/processes/edit.blade.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,8 @@ class="form-control js-icon-picker"
193193

194194
<div class="col-6">
195195
<div class="form-group">
196-
<label class="recommended" for="owner">{{ trans('cruds.process.fields.owner') }}</label>
196+
<label class="label-maturity-1"
197+
for="owner">{{ trans('cruds.process.fields.owner') }}</label>
197198
<select class="form-control select2-free {{ $errors->has('owner') ? 'is-invalid' : '' }}"
198199
name="owner" id="owner">
199200
@if (!$owner_list->contains(old('owner')))

0 commit comments

Comments
 (0)