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

escape asset tags and notification

Browse source
This commit is contained in:
Godfrey M 2025-02-26 10:36:27 -08:00
parent 99fc11aa62
commit cf544f9fae
3 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -550,7 +550,7 @@ class BulkAssetsController extends Controller
$errorMessages[] = trans_choice( $errorMessages[] = trans_choice(
'admin/hardware/message.delete.assigned_to_error', 'admin/hardware/message.delete.assigned_to_error',
$assignedAssets->count(), $assignedAssets->count(),
['asset_tag' => $assignedTags] ['asset_tag' => e($assignedTags)]
); );
} }
@ -559,7 +559,7 @@ class BulkAssetsController extends Controller
$errorMessages[] = trans_choice( $errorMessages[] = trans_choice(
'admin/hardware/message.delete.parent_assigned_error', 'admin/hardware/message.delete.parent_assigned_error',
$parentAssets->count(), $parentAssets->count(),
['asset_tag' => $parentTags] ['asset_tag' => e($parentTags)]
); );
} }
@ -567,7 +567,7 @@ class BulkAssetsController extends Controller
// Combine both messages // Combine both messages
$combinedErrorMessage = implode('<br>', $errorMessages); $combinedErrorMessage = implode('<br>', $errorMessages);
return redirect($bulk_back_url)->with('error', $combinedErrorMessage); return redirect($bulk_back_url)->with('error-unescaped', $combinedErrorMessage);
} }
foreach (Asset::wherein('id', $assetIds)->get() as $asset) { foreach (Asset::wherein('id', $assetIds)->get() as $asset) {

4
resources/lang/en-US/admin/hardware/message.php
View file

@ -72,8 +72,8 @@ return [
'delete' => [ 'delete' => [
'confirm' => 'Are you sure you wish to delete this asset?', 'confirm' => 'Are you sure you wish to delete this asset?',
'error' => 'There was an issue deleting the asset. Please try again.', 'error' => 'There was an issue deleting the asset. Please try again.',
'assigned_to_error' => '{1}Asset Tag: :asset_tag is currently checked out. Check in this device before deletion of this asset.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion of these assets.', 'assigned_to_error' => 'Asset Tag: :asset_tag is currently checked out. Check in this device before deletion of this asset.|[2,*]Asset Tags: :asset_tag are currently checked out. Check in these devices before deletion of these assets.',
'parent_assigned_error' => '{1}Asset Tag: :asset_tag currently has items checked out. Check in all items attached before deletion of this asset.|[2,*]Asset Tags: :asset_tag currently have items checked out. Check in these devices before deletion of these assets.', 'parent_assigned_error' => 'Asset Tag: :asset_tag currently has items checked out. Check in all items attached before deletion of this asset.|[2,*]Asset Tags: :asset_tag currently have items checked out. Check in these devices before deletion of these assets.',
'nothing_updated' => 'No assets were selected, so nothing was deleted.', 'nothing_updated' => 'No assets were selected, so nothing was deleted.',
'success' => 'The asset was deleted successfully.', 'success' => 'The asset was deleted successfully.',
], ],

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

@ -109,10 +109,20 @@
<button type="button" class="close" data-dismiss="alert">&times;</button> <button type="button" class="close" data-dismiss="alert">&times;</button>
<i class="fas fa-exclamation-triangle faa-pulse animated"></i> <i class="fas fa-exclamation-triangle faa-pulse animated"></i>
<strong>{{ trans('general.error') }}: </strong> <strong>{{ trans('general.error') }}: </strong>
{!! $message !!} {{ $message }}
</div> </div>
</div> </div>
@endif @endif
@if ($message = session()->get('error-unescaped'))
<div class="col-md-12">
<div class="alert alert-error 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_error') }}: </strong>
{!! $message !!}
</div>
</div>
@endif
@if ($messages = session()->get('error_messages')) @if ($messages = session()->get('error_messages'))