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

a little work for conflicts

Browse source
This commit is contained in:
spencerrlongg 2024-11-29 14:32:19 -06:00
parent ac1d09add0
commit 0a1aba5406
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/Actions/Assets/StoreAssetAction.php
View file

@ -134,7 +134,6 @@ class StoreAssetAction
if (isset($target)) {
$asset->checkOut($target, auth()->user(), date('Y-m-d H:i:s'), $request->input('expected_checkin', null), 'Checked out on asset creation', $request->get('name'), $location);
}
//this was in api and not gui
if ($asset->image) {
$asset->image = $asset->getImageUrl();

1
app/Http/Controllers/Api/AssetsController.php
View file

@ -599,7 +599,6 @@ class AssetsController extends Controller
*/
public function store(StoreAssetRequest $request): JsonResponse
{
try {
$asset = StoreAssetAction::run(
model_id: $request->validated('model_id'),

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

@ -108,6 +108,8 @@ class AssetsController extends Controller
*/
public function store(StoreAssetRequest $request): RedirectResponse
{
$successes = [];
$errors = [];
try {
$asset_tags = $request->input('asset_tags');
$serials = $request->input('serials');
@ -141,6 +143,10 @@ class AssetsController extends Controller
last_audit_date: $request->validated('last_audit_date'),
next_audit_date: $request->validated('next_audit_date'),
);
$successes[] = "<a href='".route('hardware.show', ['hardware' => $asset->id])."' style='color: white;'>".e($asset->asset_tag)."</a>";
if (!$asset) {
$failures[] = join(",", $asset->getErrors()->all());
}
}
//});
session()->put(['redirect_option' => $request->get('redirect_option'), 'checkout_to_type' => $request->get('checkout_to_type')]);