mirror of
https://github.com/snipe/snipe-it.git
synced 2025-02-02 08:21:09 -08:00
5be5e3271d
This I think gets us closer, but still not handling the validation on the asset properly.
When I do a print_r of the validation in the other items, its looking for an error bag that looks something like this:
```
Illuminate\Support\MessageBag Object
(
[messages:protected] => Array
(
[name] => Array
(
[0] => The name field is required.
)
[seats] => Array
(
[0] => The seats field is required.
)
[category_id] => Array
(
[0] => The category id field is required.
)
)
[format:protected] => :message
)
```
Currently the Assets ajax returns:
```
[2019-05-24 06:52:06] develop.ERROR: array (
'messages' =>
array (
'model_id' =>
array (
0 => 'The model id field is required.',
),
'status_id' =>
array (
0 => 'The status id field is required.',
),
'asset_tag' =>
array (
0 => 'The asset tag field is required.',
),
),
)
```
So not sure why it’s not working.
114 lines
3.6 KiB
PHP
114 lines
3.6 KiB
PHP
<?php
|
|
|
|
namespace App\Http\Requests;
|
|
|
|
use App\Models\AssetModel;
|
|
use Session;
|
|
use Illuminate\Http\Exceptions\HttpResponseException;
|
|
use App\Helpers\Helper;
|
|
use App\Http\Requests\Request;
|
|
use Illuminate\Contracts\Validation\Validator;
|
|
|
|
class AssetRequest extends Request
|
|
{
|
|
/**
|
|
* Determine if the user is authorized to make this request.
|
|
*
|
|
* @return bool
|
|
*/
|
|
public function authorize()
|
|
{
|
|
return true;
|
|
}
|
|
|
|
/**
|
|
* Get the validation rules that apply to the request.
|
|
*
|
|
* @return array
|
|
*/
|
|
public function rules()
|
|
{
|
|
$rules = [
|
|
'name' => 'max:255|nullable',
|
|
'model_id' => 'required|integer|exists:models,id',
|
|
'status_id' => 'required|integer|exists:status_labels,id',
|
|
'company_id' => 'integer|nullable',
|
|
'warranty_months' => 'numeric|nullable',
|
|
'physical' => 'integer|nullable',
|
|
'checkout_date' => 'date',
|
|
'checkin_date' => 'date',
|
|
'supplier_id' => 'integer|nullable',
|
|
'status' => 'integer|nullable',
|
|
'purchase_cost' => 'numeric|nullable',
|
|
"assigned_user" => 'sometimes:required_without_all:assigned_asset,assigned_location',
|
|
"assigned_asset" => 'sometimes:required_without_all:assigned_user,assigned_location',
|
|
"assigned_location" => 'sometimes:required_without_all:assigned_user,assigned_asset',
|
|
];
|
|
|
|
$settings = \App\Models\Setting::getSettings();
|
|
|
|
$rules['asset_tag'] = ($settings->auto_increment_assets == '1') ? 'max:255' : 'required';
|
|
|
|
if($this->request->get('model_id') != '') {
|
|
$model = AssetModel::find($this->request->get('model_id'));
|
|
|
|
if (($model) && ($model->fieldset)) {
|
|
$rules += $model->fieldset->validation_rules();
|
|
}
|
|
}
|
|
|
|
return $rules;
|
|
|
|
}
|
|
|
|
public function response(array $errors)
|
|
{
|
|
$this->session()->flash('errors', Session::get('errors', new \Illuminate\Support\ViewErrorBag)
|
|
->put('default', new \Illuminate\Support\MessageBag($errors)));
|
|
\Input::flash();
|
|
return parent::response($errors);
|
|
}
|
|
|
|
/**
|
|
* Handle a failed validation attempt.
|
|
*
|
|
* public function json($data = [], $status = 200, array $headers = [], $options = 0)
|
|
*
|
|
* @param \Illuminate\Contracts\Validation\Validator $validator
|
|
* @return void
|
|
*
|
|
* @throws \Illuminate\Validation\ValidationException
|
|
*/
|
|
protected function failedValidation(Validator $validator)
|
|
{
|
|
// $status, $payload = null, $messages = null
|
|
//$array['status'] = 'error';
|
|
//$array['payload'] = null;
|
|
$array['messages'] = [];
|
|
//$array['errors'] = [];
|
|
|
|
if ($validator->errors()) {
|
|
foreach ($validator->errors()->messages() as $field => $errors) {
|
|
$array['messages'][$field] = $errors;
|
|
//$array['errors'][$field] = $errors;
|
|
|
|
}
|
|
}
|
|
|
|
|
|
// $errors = $validator->errors();
|
|
// \Log::debug('failedValidation');
|
|
// \Log::debug('validator->errors()->all()');
|
|
// \Log::debug(print_r($validator->errors()->all(), true));
|
|
// \Log::debug('validator->errors()');
|
|
// \Log::debug(print_r($validator->errors(), true));
|
|
// \Log::debug('validator->errors()->messages()');
|
|
// \Log::debug(print_r($validator->errors()->messages(), true));
|
|
// \Log::debug('array');
|
|
\Log::error($array);
|
|
|
|
throw new HttpResponseException(response()->json($array, 200));
|
|
|
|
}
|
|
}
|