DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-14 01:24:06 -08:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2023-10-18 19:16:55 +01:00
parent 41e96ad0ab 38066bf162
commit bcce282ef9
5 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -530,7 +530,6 @@ class AssetsController extends Controller
* @author [A. Gianotto] [<snipe@snipe.net>] * @author [A. Gianotto] [<snipe@snipe.net>]
* @param \App\Http\Requests\ImageUploadRequest $request * @param \App\Http\Requests\ImageUploadRequest $request
* @since [v4.0] * @since [v4.0]
* @return JsonResponse
*/ */
public function store(ImageUploadRequest $request) public function store(ImageUploadRequest $request)
{ {

2
app/Models/Asset.php
View file

@ -220,8 +220,6 @@ class Asset extends Depreciable
} }
} }
return parent::save($params); return parent::save($params);
} }

2
app/Models/CustomFieldset.php
View file

@ -92,6 +92,8 @@ class CustomFieldset extends Model
array_push($rule, $field->attributes['format']); array_push($rule, $field->attributes['format']);
$rules[$field->db_column_name()] = $rule; $rules[$field->db_column_name()] = $rule;
//add not_array to rules for all fields
$rules[$field->db_column_name()][] = 'not_array';
} }
return $rules; return $rules;

4
app/Providers/ValidationServiceProvider.php
View file

@ -232,6 +232,10 @@ class ValidationServiceProvider extends ServiceProvider
return true; return true;
} }
}); });
Validator::extend('not_array', function ($attribute, $value, $parameters, $validator) {
return !is_array($value);
});
} }
/** /**

1
resources/lang/en/validation.php
View file

@ -95,6 +95,7 @@ return [
'url' => 'The :attribute format is invalid.', 'url' => 'The :attribute format is invalid.',
'unique_undeleted' => 'The :attribute must be unique.', 'unique_undeleted' => 'The :attribute must be unique.',
'non_circular' => 'The :attribute must not create a circular reference.', 'non_circular' => 'The :attribute must not create a circular reference.',
'not_array' => 'The :attribute field cannot be an array.',
'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.', 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
'letters' => 'Password must contain at least one letter.', 'letters' => 'Password must contain at least one letter.',
'numbers' => 'Password must contain at least one number.', 'numbers' => 'Password must contain at least one number.',