DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-21 03:15:45 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Create a session on bulk actions, store it for redirect, then delete it

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2022-05-06 05:14:08 -07:00
parent 243739e9c3
commit 76213ec3d9
1 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
app/Http/Controllers/Assets/BulkAssetsController.php
View file

@ -11,6 +11,7 @@ use App\Models\Setting;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Session;
class BulkAssetsController extends Controller class BulkAssetsController extends Controller
{ {
@ -33,6 +34,12 @@ class BulkAssetsController extends Controller
return redirect()->back()->with('error', 'No assets selected'); return redirect()->back()->with('error', 'No assets selected');
} }
$bulk_back_url = request()->headers->get('referer');
session(['bulk_back_url' => $bulk_back_url]);
\Log::debug('Back to url: '.$bulk_back_url);
$asset_ids = array_values(array_unique($request->input('ids'))); $asset_ids = array_values(array_unique($request->input('ids')));
@ -73,10 +80,11 @@ class BulkAssetsController extends Controller
{ {
$this->authorize('update', Asset::class); $this->authorize('update', Asset::class);
\Log::debug($request->input('ids')); // Get the back url from the session and then destroy the session
$bulk_back_url = $request->session()->pull('bulk_back_url');
if (! $request->filled('ids') || count($request->input('ids')) <= 0) { if (! $request->filled('ids') || count($request->input('ids')) <= 0) {
return redirect()->route('hardware.index')->with('warning', trans('No assets selected, so nothing was updated.')); return redirect($back_to_url)->with('warning', trans('No assets selected, so nothing was updated.'));
} }
$assets = array_keys($request->input('ids')); $assets = array_keys($request->input('ids'));
@ -147,11 +155,13 @@ class BulkAssetsController extends Controller
->update($this->update_array); ->update($this->update_array);
} // endforeach } // endforeach
return redirect()->route('hardware.index')->with('success', trans('admin/hardware/message.update.success')); return redirect($bulk_back_url)->with('success', trans('admin/hardware/message.update.success'));
// no values given, nothing to update
} }
return redirect()->route('hardware.index')->with('warning', trans('admin/hardware/message.update.nothing_updated')); // no values given, nothing to update
return redirect($bulk_back_url)->with('warning', trans('admin/hardware/message.update.nothing_updated'));
} }
/** /**
@ -188,6 +198,9 @@ class BulkAssetsController extends Controller
{ {
$this->authorize('delete', Asset::class); $this->authorize('delete', Asset::class);
// Get the back url from the session and then destroy the session
$bulk_back_url = $request->session()->pull('bulk_back_url');
if ($request->filled('ids')) { if ($request->filled('ids')) {
$assets = Asset::find($request->get('ids')); $assets = Asset::find($request->get('ids'));
foreach ($assets as $asset) { foreach ($assets as $asset) {
@ -199,11 +212,11 @@ class BulkAssetsController extends Controller
->update($update_array); ->update($update_array);
} // endforeach } // endforeach
return redirect()->to('hardware')->with('success', trans('admin/hardware/message.delete.success')); return redirect($bulk_back_url)->with('success', trans('admin/hardware/message.delete.success'));
// no values given, nothing to update // no values given, nothing to update
} }
return redirect()->to('hardware')->with('info', trans('admin/hardware/message.delete.nothing_updated')); return redirect($bulk_back_url)->with('info', trans('admin/hardware/message.delete.nothing_updated'));
} }
/** /**