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

16
app/Http/Controllers/UserController.php
View File

@@ -32,10 +32,10 @@ use App\Models\Dashboard;
use App\Models\User;
use App\Models\UserPref;
use Auth;
use Flasher\Prime\FlasherInterface;
use Illuminate\Support\Str;
use LibreNMS\Authentication\LegacyAuth;
use LibreNMS\Config;
use Toastr;
use URL;
class UserController extends Controller
@@ -89,7 +89,7 @@ class UserController extends Controller
* @param StoreUserRequest $request
* @return \Illuminate\Http\RedirectResponse
*/
public function store(StoreUserRequest $request)
public function store(StoreUserRequest $request, FlasherInterface $flasher)
{
$user = $request->only(['username', 'realname', 'email', 'descr', 'level', 'can_modify_passwd']);
$user['auth_type'] = LegacyAuth::getType();
@@ -102,12 +102,12 @@ class UserController extends Controller
$this->updateDashboard($user, $request->get('dashboard'));
if ($user->save()) {
Toastr::success(__('User :username created', ['username' => $user->username]));
$flasher->addSuccess(__('User :username created', ['username' => $user->username]));
return redirect(route('users.index'));
}
Toastr::error(__('Failed to create user'));
$flasher->addError(__('Failed to create user'));
return redirect()->back();
}
@@ -165,7 +165,7 @@ class UserController extends Controller
* @param User $user
* @return \Illuminate\Http\RedirectResponse
*/
public function update(UpdateUserRequest $request, User $user)
public function update(UpdateUserRequest $request, User $user, FlasherInterface $flasher)
{
if ($request->get('new_password') && $user->canSetPassword($request->user())) {
$user->setPassword($request->new_password);
@@ -183,16 +183,16 @@ class UserController extends Controller
$user->fill($request->all());
if ($request->has('dashboard') && $this->updateDashboard($user, $request->get('dashboard'))) {
Toastr::success(__('Updated dashboard for :username', ['username' => $user->username]));
$flasher->addSuccess(__('Updated dashboard for :username', ['username' => $user->username]));
}
if ($user->save()) {
Toastr::success(__('User :username updated', ['username' => $user->username]));
$flasher->addSuccess(__('User :username updated', ['username' => $user->username]));
return redirect(route(Str::contains(URL::previous(), 'preferences') ? 'preferences.index' : 'users.index'));
}
Toastr::error(__('Failed to update user :username', ['username' => $user->username]));
$flasher->addError(__('Failed to update user :username', ['username' => $user->username]));
return redirect()->back();
}