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

Merge pull request #13853 from snipe/features/link_back_to_asset_on_create

Browse source 
Link back to asset on create
This commit is contained in:
snipe 2023-11-13 16:37:35 +00:00 committed by GitHub
parent 9e1cfac995 9bff2d0bbf
commit 0bae1a1f5e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Http/Controllers/Assets/AssetsController.php
View file

@ -204,12 +204,8 @@ class AssetsController extends Controller
} }
if ($success) { if ($success) {
// Redirect to the asset listing page
$minutes = 518400;
// dd( $_POST['options']);
// Cookie::queue(Cookie::make('optional_info', json_decode($_POST['options']), $minutes));
return redirect()->route('hardware.index') return redirect()->route('hardware.index')
->with('success', trans('admin/hardware/message.create.success')); ->with('success-unescaped', trans('admin/hardware/message.create.success_linked', ['link' => route('hardware.show', $asset->id), 'id', 'tag' => $asset->asset_tag]));
} }

4
app/Http/Controllers/Components/ComponentCheckinController.php
View file

@ -96,8 +96,8 @@ class ComponentCheckinController extends Controller
$asset = Asset::find($component_assets->asset_id); $asset = Asset::find($component_assets->asset_id);
event(new CheckoutableCheckedIn($component, $asset, Auth::user(), $request->input('note'), Carbon::now())); event(new CheckoutableCheckedIn($component, $asset, Auth::user(), $request->input('note'), Carbon::now()));
if($backto == 'asset'){ if ($backto == 'asset'){
return redirect()->route('hardware.view', $asset->id)->with('success', return redirect()->route('hardware.show', $asset->id)->with('success',
trans('admin/components/message.checkin.success')); trans('admin/components/message.checkin.success'));
} }

1
resources/lang/en/admin/hardware/message.php
View file

@ -11,6 +11,7 @@ return [
'create' => [ 'create' => [
'error' => 'Asset was not created, please try again. :(', 'error' => 'Asset was not created, please try again. :(',
'success' => 'Asset created successfully. :)', 'success' => 'Asset created successfully. :)',
'success_linked' => 'Asset with tag :tag was created successfully. <strong><a href=":link" style="color: white;">Click here to view</a></strong>.',
], ],
'update' => [ 'update' => [

12
resources/views/notifications.blade.php
View file

@ -35,6 +35,18 @@
@endif @endif
@if ($message = Session::get('success-unescaped'))
<div class="col-md-12">
<div class="alert alert-success fade in">
<button type="button" class="close" data-dismiss="alert">&times;</button>
<i class="fas fa-check faa-pulse animated"></i>
<strong>{{ trans('general.notification_success') }}: </strong>
{!! $message !!}
</div>
</div>
@endif
@if ($assets = Session::get('assets')) @if ($assets = Session::get('assets'))
@foreach ($assets as $asset) @foreach ($assets as $asset)
<div class="col-md-12"> <div class="col-md-12">

12
routes/web/hardware.php
View file

@ -122,9 +122,10 @@ Route::group(
[AssetCheckinController::class, 'store'] [AssetCheckinController::class, 'store']
)->name('hardware.checkin.store'); )->name('hardware.checkin.store');
Route::get('{assetId}/view', // Redirect old legacy /asset_id/view urls to the resource route version
[AssetsController::class, 'show'] Route::get('{assetId}/view', function ($assetId) {
)->name('hardware.view'); return redirect()->route('hardware.show', ['hardware' => $assetId]);
});
Route::get('{assetId}/qr_code', Route::get('{assetId}/qr_code',
[AssetsController::class, 'getQrCode'] [AssetsController::class, 'getQrCode']
@ -178,14 +179,15 @@ Route::group(
Route::post('bulkcheckout', Route::post('bulkcheckout',
[BulkAssetsController::class, 'storeCheckout'] [BulkAssetsController::class, 'storeCheckout']
)->name('hardware.bulkcheckout.store'); )->name('hardware.bulkcheckout.store');
}); });
Route::resource('hardware', Route::resource('hardware',
AssetsController::class, AssetsController::class,
[ [
'middleware' => ['auth'], 'middleware' => ['auth'],
'parameters' => ['asset' => 'asset_id' 'parameters' => ['asset' => 'asset_id'],
], 'names' => ['show' => 'view'],
]); ]);
Route::get('ht/{any?}', Route::get('ht/{any?}',