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

PHP-Flasher for toast messages (#13401)

Browse Source 
* PHP-Flasher for toast messages
Allows customized template
removes dependency on unmaintained package using dev stability
no solution for javascript toasts yet

Use DI in places it makes sense

allow html in flashes

Use "template.librenms" as a default notification style

merge toast containers
toastr needs to be second because it will find the containr made by flasher, but the inverse is not true

upgrade php-flasher to add custom options and persistent notifications

Add dark theme

* update composer.lock
This commit is contained in:
Tony Murray
2021-10-29 09:13:56 -05:00
committed by GitHub
parent 38773598e0
commit 5900edbf16
35 changed files with 598 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/DeviceGroupController.php
+7 -7
View File
@@ -4,11 +4,11 @@ namespace App\Http\Controllers;
use App\Models\Device;
use App\Models\DeviceGroup;
use Flasher\Prime\FlasherInterface;
use Illuminate\Http\Request;
use Illuminate\Validation\Rule;
use LibreNMS\Alerting\QueryBuilderFilter;
use LibreNMS\Alerting\QueryBuilderFluentParser;
use Toastr;
class DeviceGroupController extends Controller
{
@@ -55,7 +55,7 @@ class DeviceGroupController extends Controller
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\RedirectResponse
*/
public function store(Request $request)
public function store(Request $request, FlasherInterface $flasher)
{
$this->validate($request, [
'name' => 'required|string|unique:device_groups',
@@ -73,7 +73,7 @@ class DeviceGroupController extends Controller
$deviceGroup->devices()->sync($request->devices);
}
Toastr::success(__('Device Group :name created', ['name' => $deviceGroup->name]));
$flasher->addSuccess(__('Device Group :name created', ['name' => $deviceGroup->name]));
return redirect()->route('device-groups.index');
}
@@ -116,7 +116,7 @@ class DeviceGroupController extends Controller
* @param \App\Models\DeviceGroup $deviceGroup
* @return \Illuminate\Http\RedirectResponse
*/
public function update(Request $request, DeviceGroup $deviceGroup)
public function update(Request $request, DeviceGroup $deviceGroup, FlasherInterface $flasher)
{
$this->validate($request, [
'name' => [
@@ -149,9 +149,9 @@ class DeviceGroupController extends Controller
if ($deviceGroup->isDirty() || $devices_updated) {
try {
if ($deviceGroup->save() || $devices_updated) {
Toastr::success(__('Device Group :name updated', ['name' => $deviceGroup->name]));
$flasher->addSuccess(__('Device Group :name updated', ['name' => $deviceGroup->name]));
} else {
Toastr::error(__('Failed to save'));
$flasher->addError(__('Failed to save'));
return redirect()->back()->withInput();
}
@@ -161,7 +161,7 @@ class DeviceGroupController extends Controller
]);
}
} else {
Toastr::info(__('No changes made'));
$flasher->addInfo(__('No changes made'));
}
return redirect()->route('device-groups.index');