ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rethought, keeping previous page as an option

Browse Source
This commit is contained in:
Godfrey M
2025-08-05 12:29:59 -07:00
parent 18e49e9067
commit bd2acefecc
12 changed files with 61 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Accessories/AccessoriesController.php
+6 -1
View File
@@ -90,7 +90,12 @@ class AccessoriesController extends Controller
$accessory = $request->handleImages($accessory);
}
session()->put(['redirect_option' => $request->get('redirect_option')]);
if($request->get('redirect_option') === 'back'){
session()->put(['redirect_option' => 'index']);
} else {
session()->put(['redirect_option' => $request->get('redirect_option')]);
}
// Was the accessory created?
if ($accessory->save()) {
// Redirect to the new accessory page
app/Http/Controllers/Assets/AssetsController.php
+6 -2
View File
@@ -234,9 +234,13 @@ class AssetsController extends Controller
$failures[] = join(",", $asset->getErrors()->all());
}
}
if($request->get('redirect_option') === 'back'){
session()->put(['redirect_option' => 'index']);
} else {
session()->put(['redirect_option' => $request->get('redirect_option')]);
}
session()->put(['redirect_option' => $request->get('redirect_option'),
'checkout_to_type' => $request->get('checkout_to_type'),
session()->put(['checkout_to_type' => $request->get('checkout_to_type'),
'other_redirect' => 'model' ]);
app/Http/Controllers/Components/ComponentsController.php
+6 -1
View File
@@ -88,7 +88,12 @@ class ComponentsController extends Controller
$component = $request->handleImages($component);
session()->put(['redirect_option' => $request->get('redirect_option')]);
if($request->get('redirect_option') === 'back'){
session()->put(['redirect_option' => 'index']);
} else {
session()->put(['redirect_option' => $request->get('redirect_option')]);
}
if ($component->save()) {
return Helper::getRedirectOption($request, $component->id, 'Components')
app/Http/Controllers/Consumables/ConsumablesController.php
+6 -1
View File
@@ -98,7 +98,12 @@ class ConsumablesController extends Controller
$consumable = $request->handleImages($consumable);
}
session()->put(['redirect_option' => $request->get('redirect_option')]);
if($request->get('redirect_option') === 'back'){
session()->put(['redirect_option' => 'index']);
} else {
session()->put(['redirect_option' => $request->get('redirect_option')]);
}
if ($consumable->save()) {
return Helper::getRedirectOption($request, $consumable->id, 'Consumables')
app/Http/Controllers/Licenses/LicensesController.php
+5 -1
View File
@@ -102,7 +102,11 @@ class LicensesController extends Controller
$license->created_by = auth()->id();
$license->min_amt = $request->input('min_amt');
session()->put(['redirect_option' => $request->get('redirect_option')]);
if($request->get('redirect_option') === 'back'){
session()->put(['redirect_option' => 'index']);
} else {
session()->put(['redirect_option' => $request->get('redirect_option')]);
}
if ($license->save()) {
return Helper::getRedirectOption($request, $license->id, 'Licenses')
app/Http/Controllers/Users/UsersController.php
+6 -1
View File
@@ -126,7 +126,12 @@ class UsersController extends Controller
// we have to invoke the form request here to handle image uploads
app(ImageUploadRequest::class)->handleImages($user, 600, 'avatar', 'avatars', 'avatar');
session()->put(['redirect_option' => $request->get('redirect_option')]);
if($request->get('redirect_option') === 'back'){
session()->put(['redirect_option' => 'index']);
} else {
session()->put(['redirect_option' => $request->get('redirect_option')]);
}
if ($user->save()) {
if ($request->filled('groups')) {