Merge pull request #873 from dbarzin/dev

Dev

Author: dbarzin

resources/views/admin/peripherals/index.blade.php

@@ -37,6 +37,9 @@
                         <th>
                             {{ trans('cruds.peripheral.fields.responsible') }}
                         </th>
+                        <th>
+                            {{ trans('cruds.peripheral.fields.address_ip') }}
+                        </th>
                         <th>
                             {{ trans('cruds.peripheral.fields.site') }}
                         </th>
@@ -74,6 +77,9 @@
                             <td>
                                 {{ $peripheral->responsible ?? '' }}
                             </td>
+                            <td>
+                                {{ $peripheral->address_ip ?? '' }}
+                            </td>
                             <td>
                                 {{ $peripheral->site->name ?? '' }}
                             </td>

resources/views/admin/reports/logical_infrastructure.blade.php

@@ -1306,7 +1306,7 @@
 
     @can('physical_security_device_access')
     @foreach($physicalSecurityDevices as $physicalSecurityDevice)
-        SECURITY{{ $physicalSecurityDevice->id }} [label="{{ $physicalSecurityDevice->name }} {{ Session::get('show_ip') ? chr(13) . $phone->address_ip : '' }}" shape=none labelloc="b"  width=1 height={{ Session::get('show_ip') && ($physicalSecurityDevice->address_ip!=null) ? '1.5' :'1.1' }} image="/images/securitydevice.png" href="#SECURITY{{$physicalSecurityDevice->id}}"]
+        SECURITY{{ $physicalSecurityDevice->id }} [label="{{ $physicalSecurityDevice->name }} {{ Session::get('show_ip') ? chr(13) . $physicalSecurityDevice->address_ip : '' }}" shape=none labelloc="b"  width=1 height={{ Session::get('show_ip') && ($physicalSecurityDevice->address_ip!=null) ? '1.5' :'1.1' }} image="/images/securitydevice.png" href="#SECURITY{{$physicalSecurityDevice->id}}"]
         @foreach(explode(',',$physicalSecurityDevice->address_ip) as $address)
             @foreach($subnetworks as $subnetwork)
                 @if ($subnetwork->contains($address))