Skip to content

Commit 1618c9a

Browse files
committed
Changed confirmation message
Signed-off-by: snipe <[email protected]>
1 parent 5344ef4 commit 1618c9a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

app/Http/Controllers/Assets/AssetsController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ public function update(ImageUploadRequest $request, Asset $asset) : RedirectResp
342342

343343
// This is an archived or undeployable - we should check the asset back in.
344344
// Pending is allowed here
345-
if (($status) && (($status->getStatuslabelType() != 'pending') || ($status->getStatuslabelType() != 'deployable')) && ($target = $asset->assignedTo)) {
345+
if (($status) && (($status->getStatuslabelType() != 'pending') && ($status->getStatuslabelType() != 'deployable')) && ($target = $asset->assignedTo)) {
346346
$originalValues = $asset->getRawOriginal();
347347
$asset->assigned_to = null;
348348
$asset->assigned_type = null;

resources/lang/en-US/admin/hardware/form.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
'asset_location_update_actual' => 'Update only actual location',
5757
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
5858
'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
59-
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
59+
'asset_deployable' => 'This asset can be checked out.',
6060
'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
6161
'optional_infos' => 'Optional Information',
6262
'order_details' => 'Order Related Information',

0 commit comments

Comments
 (0)