mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix public status location (#10526)

Browse Source 
* Fix public status location
Implementing __toString() seemed to be the most elegant way to fix it.
Added pre-loading for locations too

* Take advantage of new __toString function
This commit is contained in:
Tony Murray
2019-08-19 22:52:21 -05:00
committed by GitHub
parent 610afac9e7
commit d3243bd32e
4 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Auth/LoginController.php
+1 -1
View File
@@ -47,7 +47,7 @@ class LoginController extends Controller
public function showLoginForm()
{
if (Config::get('public_status')) {
$devices = Device::isActive()->get();
$devices = Device::isActive()->with('location')->get();
return view('auth.public-status')->with('devices', $devices);
}
return view('auth.login');
app/Http/Controllers/Table/DeviceController.php
+3 -9
View File
@@ -251,15 +251,9 @@ class DeviceController extends TableController
*/
private function getLocation($device)
{
if ($device->location) {
if (extension_loaded('mbstring')) {
return mb_substr($device->location->location, 0, 32, 'utf8');
} else {
return substr($device->location->location, 0, 32);
}
}
return '';
return extension_loaded('mbstring')
? mb_substr($device->location, 0, 32, 'utf8')
: substr($device->location, 0, 32);
}
/**