DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-24 05:04:07 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

edits for PR

Browse source
This commit is contained in:
akemi 2022-11-29 15:59:36 -05:00
parent 39e06a8856
commit 55f5e7866d
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Http/Controllers/Api/UsersController.php
View file

@ -492,7 +492,7 @@ class UsersController extends Controller
} }
/** /**
* Notify a specific user via email with all of his assigned assets. * Notify a specific user via email with all of their assigned assets.
* *
* @author [Lukas Fehling] [<lukas.fehling@adabay.rocks>] * @author [Lukas Fehling] [<lukas.fehling@adabay.rocks>]
* @since [v6.0.13] * @since [v6.0.13]
@ -505,10 +505,10 @@ class UsersController extends Controller
$user = User::findOrFail($id); $user = User::findOrFail($id);
if (empty($user->email)) { if (empty($user->email)) {
return response()->json(Helper::formatStandardApiResponse(‘error’, $accessory, trans('admin/accessories/message.inventorynotification.error'))); return response()->json(Helper::formatStandardApiResponse(‘error’, null, trans('admin/users/message.inventorynotification.error')));
} }
return response()->Helper::formatStandardApiResponse('success', $accessory, trans('admin/accessories/message.inventorynotification.success')); return response()->Helper::formatStandardApiResponse('success', null, trans('admin/users/message.inventorynotification.success'));
} }

4
resources/lang/en/admin/accessories/message.php
View file

@ -33,10 +33,6 @@ return array(
'user_does_not_exist' => 'That user is invalid. Please try again.' 'user_does_not_exist' => 'That user is invalid. Please try again.'
), ),
'inventorynotification' => array(
'error' => 'This user has no email set.',
'success' => 'The user has been notified about their current inventory.'
)
); );

4
resources/lang/en/admin/users/message.php
View file

@ -59,4 +59,8 @@ return array(
'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.', 'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
), ),
'inventorynotification' => array(
'error' => 'This user has no email set.',
'success' => 'The user has been notified about their current inventory.'
)
); );