Skip to content

A free open source IT asset/license management system

Merge pull request #16947 from Godmartinz/add-require-serial-to-models

snipe739980aa0987
diff --cc app/Http/Controllers/Assets/AssetsController.php
index afc16a73ca,7f10f6ff62..13201c51ec
--- a/app/Http/Controllers/Assets/AssetsController.php
+++ b/app/Http/Controllers/Assets/AssetsController.php
@@@ -446,15 -427,18 +463,22 @@@ class AssetsController extends Controll
}
}
}
+ session()->put([
+ 'redirect_option' => $request->get('redirect_option'),
+ 'checkout_to_type' => $request->get('checkout_to_type'),
+ 'other_redirect' => $request->get('redirect_option') === 'other_redirect' ? 'model' : null,
+ ]);
- session()->put(['redirect_option' => $request->get('redirect_option'), 'checkout_to_type' => $request->get('checkout_to_type')]);
+ //Validate required serial based on model setting
+ if ($model && $model->require_serial === 1 && empty($serial[1])) {
+ return redirect()->to(Helper::getRedirectOption($request, $asset->id, 'Assets'))
+ ->with('warning', trans('admin/hardware/form.serial_required_post_model_update', [
+ 'asset_model' => $model->name
+ ]));
+ }
if ($asset->save()) {
- return redirect()->to(Helper::getRedirectOption($request, $asset->id, 'Assets'))
+ return Helper::getRedirectOption($request, $asset->id, 'Assets')
->with('success', trans('admin/hardware/message.update.success'));
}