@@ -82,7 +82,8 @@ discard block |
||
| 82 | 82 | $uptime = Settings::get('uptime_warning', 84600); |
| 83 | 83 | if ($request->user()->hasGlobalRead()) { |
| 84 | 84 | $devices = Device::where('ignore', '=', 0)->get(); |
| 85 | - } else { |
|
| 85 | + } |
|
| 86 | + else { |
|
| 86 | 87 | $devices = User::find($request->user()->user_id)->devices()->where('ignore', '=', 0)->get(); |
| 87 | 88 | } |
| 88 | 89 | $count = ['warn' => 0, 'up' => 0, 'down' => 0]; |
@@ -90,10 +91,12 @@ discard block |
||
| 90 | 91 | if ($device->status == 1) { |
| 91 | 92 | if (($device->uptime < $uptime) && ($device->uptime != '0')) { |
| 92 | 93 | $count['warn']++; |
| 93 | - } else { |
|
| 94 | + } |
|
| 95 | + else { |
|
| 94 | 96 | $count['up']++; |
| 95 | 97 | } |
| 96 | - } else { |
|
| 98 | + } |
|
| 99 | + else { |
|
| 97 | 100 | $count['down']++; |
| 98 | 101 | } |
| 99 | 102 | } |
@@ -122,7 +125,8 @@ discard block |
||
| 122 | 125 | $count['ports']['down'] = Port::isDown()->count(); |
| 123 | 126 | $count['ports']['ignored'] = Port::isIgnored()->count(); |
| 124 | 127 | $count['ports']['disabled'] = Port::isDisabled()->count(); |
| 125 | - } else { |
|
| 128 | + } |
|
| 129 | + else { |
|
| 126 | 130 | $user = User::find($request->user()->user_id); |
| 127 | 131 | |
| 128 | 132 | $count['devices']['total'] = $user->devices()->count(); |
@@ -25,7 +25,6 @@ |
||
| 25 | 25 | |
| 26 | 26 | namespace App\DataTables; |
| 27 | 27 | |
| 28 | -use App\Models\DeviceGroup; |
|
| 29 | 28 | use App\Models\Device; |
| 30 | 29 | |
| 31 | 30 | class DeviceDataTable extends BaseDataTable |
@@ -3,7 +3,6 @@ |
||
| 3 | 3 | namespace App\Http\Controllers; |
| 4 | 4 | |
| 5 | 5 | use App\DataTables\DeviceDataTable; |
| 6 | -use App\DataTables\DeviceGroupDataTable; |
|
| 7 | 6 | use App\Models\DeviceGroup; |
| 8 | 7 | use Dingo\Api\Http; |
| 9 | 8 | use Dingo\Api\Routing\Helpers; |
@@ -25,7 +25,6 @@ |
||
| 25 | 25 | |
| 26 | 26 | namespace App\Http\Controllers; |
| 27 | 27 | |
| 28 | -use App\Http\Requests; |
|
| 29 | 28 | use App\Http\Requests\AdminOnlyRequest; |
| 30 | 29 | use App\Models\Port; |
| 31 | 30 | use App\Models\User; |