DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-21 03:15:45 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixes #3907

Browse source
This commit is contained in:
snipe 2017-08-31 13:45:48 -07:00
parent b0f74466bb
commit 0054ce3071
3 changed files with 97 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/Http/Controllers/SettingsController.php
View file

@ -20,6 +20,7 @@ use Auth;
use App\Models\User; use App\Models\User;
use App\Http\Requests\SetupUserRequest; use App\Http\Requests\SetupUserRequest;
use App\Http\Requests\ImageUploadRequest; use App\Http\Requests\ImageUploadRequest;
use App\Http\Requests\SettingsLdapRequest;
/** /**
* This controller handles all actions related to Settings for * This controller handles all actions related to Settings for

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

@ -13,62 +13,91 @@ return array(
| |
*/ */
"accepted" => "The :attribute must be accepted.", 'accepted' => 'The :attribute must be accepted.',
"active_url" => "The :attribute is not a valid URL.", 'active_url' => 'The :attribute is not a valid URL.',
"after" => "The :attribute must be a date after :date.", 'after' => 'The :attribute must be a date after :date.',
"alpha" => "The :attribute may only contain letters.", 'after_or_equal' => 'The :attribute must be a date after or equal to :date.',
"alpha_dash" => "The :attribute may only contain letters, numbers, and dashes.", 'alpha' => 'The :attribute may only contain letters.',
"alpha_num" => "The :attribute may only contain letters and numbers.", 'alpha_dash' => 'The :attribute may only contain letters, numbers, and dashes.',
"before" => "The :attribute must be a date before :date.", 'alpha_num' => 'The :attribute may only contain letters and numbers.',
"between" => array( 'array' => 'The :attribute must be an array.',
"numeric" => "The :attribute must be between :min - :max.", 'before' => 'The :attribute must be a date before :date.',
"file" => "The :attribute must be between :min - :max kilobytes.", 'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
"string" => "The :attribute must be between :min - :max characters.", 'between' => [
), 'numeric' => 'The :attribute must be between :min and :max.',
"boolean" => "The :attribute must be true or false.", 'file' => 'The :attribute must be between :min and :max kilobytes.',
"confirmed" => "The :attribute confirmation does not match.", 'string' => 'The :attribute must be between :min and :max characters.',
"date" => "The :attribute is not a valid date.", 'array' => 'The :attribute must have between :min and :max items.',
"date_format" => "The :attribute does not match the format :format.", ],
"different" => "The :attribute and :other must be different.", 'boolean' => 'The :attribute field must be true or false.',
"digits" => "The :attribute must be :digits digits.", 'confirmed' => 'The :attribute confirmation does not match.',
"digits_between" => "The :attribute must be between :min and :max digits.", 'date' => 'The :attribute is not a valid date.',
"email" => "The :attribute format is invalid.", 'date_format' => 'The :attribute does not match the format :format.',
"exists" => "The selected :attribute is invalid.", 'different' => 'The :attribute and :other must be different.',
"email_array" => "One or more email addresses is invalid.", 'digits' => 'The :attribute must be :digits digits.',
"hashed_pass" => "Your current password is incorrect", 'digits_between' => 'The :attribute must be between :min and :max digits.',
'dumbpwd' => 'That password is too common.', 'dimensions' => 'The :attribute has invalid image dimensions.',
"image" => "The :attribute must be an image.", 'distinct' => 'The :attribute field has a duplicate value.',
"in" => "The selected :attribute is invalid.", 'email' => 'The :attribute must be a valid email address.',
"integer" => "The :attribute must be an integer.", 'exists' => 'The selected :attribute is invalid.',
"ip" => "The :attribute must be a valid IP address.", 'file' => 'The :attribute must be a file.',
"max" => array( 'filled' => 'The :attribute field must have a value.',
"numeric" => "The :attribute may not be greater than :max.", 'image' => 'The :attribute must be an image.',
"file" => "The :attribute may not be greater than :max kilobytes.", 'in' => 'The selected :attribute is invalid.',
"string" => "The :attribute may not be greater than :max characters.", 'in_array' => 'The :attribute field does not exist in :other.',
), 'integer' => 'The :attribute must be an integer.',
"mimes" => "The :attribute must be a file of type: :values.", 'ip' => 'The :attribute must be a valid IP address.',
"min" => array( 'ipv4' => 'The :attribute must be a valid IPv4 address.',
"numeric" => "The :attribute must be at least :min.", 'ipv6' => 'The :attribute must be a valid IPv6 address.',
"file" => "The :attribute must be at least :min kilobytes.", 'json' => 'The :attribute must be a valid JSON string.',
"string" => "The :attribute must be at least :min characters.", 'max' => [
), 'numeric' => 'The :attribute may not be greater than :max.',
"not_in" => "The selected :attribute is invalid.", 'file' => 'The :attribute may not be greater than :max kilobytes.',
"numeric" => "The :attribute must be a number.", 'string' => 'The :attribute may not be greater than :max characters.',
"regex" => "The :attribute format is invalid.", 'array' => 'The :attribute may not have more than :max items.',
"required" => "The :attribute field is required.", ],
"required_if" => "The :attribute field is required when :other is :value.", 'mimes' => 'The :attribute must be a file of type: :values.',
"required_with" => "The :attribute field is required when :values is present.", 'mimetypes' => 'The :attribute must be a file of type: :values.',
"required_without" => "The :attribute field is required when :values is not present.", 'min' => [
"same" => "The :attribute and :other must match.", 'numeric' => 'The :attribute must be at least :min.',
"size" => array( 'file' => 'The :attribute must be at least :min kilobytes.',
"numeric" => "The :attribute must be :size.", 'string' => 'The :attribute must be at least :min characters.',
"file" => "The :attribute must be :size kilobytes.", 'array' => 'The :attribute must have at least :min items.',
"string" => "The :attribute must be :size characters.", ],
), 'not_in' => 'The selected :attribute is invalid.',
"unique" => "The :attribute has already been taken.", 'numeric' => 'The :attribute must be a number.',
"url" => "The :attribute format is invalid.", 'present' => 'The :attribute field must be present.',
"statuslabel_type" => "You must select a valid status label type", 'regex' => 'The :attribute format is invalid.',
"unique_undeleted" => "The :attribute must be unique.", 'required' => 'The :attribute field is required.',
'required_if' => 'The :attribute field is required when :other is :value.',
'required_unless' => 'The :attribute field is required unless :other is in :values.',
'required_with' => 'The :attribute field is required when :values is present.',
'required_with_all' => 'The :attribute field is required when :values is present.',
'required_without' => 'The :attribute field is required when :values is not present.',
'required_without_all' => 'The :attribute field is required when none of :values are present.',
'same' => 'The :attribute and :other must match.',
'size' => [
'numeric' => 'The :attribute must be :size.',
'file' => 'The :attribute must be :size kilobytes.',
'string' => 'The :attribute must be :size characters.',
'array' => 'The :attribute must contain :size items.',
],
'string' => 'The :attribute must be a string.',
'timezone' => 'The :attribute must be a valid zone.',
'unique' => 'The :attribute has already been taken.',
'uploaded' => 'The :attribute failed to upload.',
'url' => 'The :attribute format is invalid.',
/*
|--------------------------------------------------------------------------
| Custom Validation Language Lines
|--------------------------------------------------------------------------
|
| Here you may specify custom validation messages for attributes using the
| convention "attribute.rule" to name the lines. This makes it quick to
| specify a specific custom language line for a given attribute rule.
|
*/
/* /*
@ -82,8 +111,14 @@ return array(
| |
*/ */
'custom' => array(), 'custom' => [
'alpha_space' => "The :attribute field contains a character that is not allowed.", 'alpha_space' => "The :attribute field contains a character that is not allowed.",
"email_array" => "One or more email addresses is invalid.",
"hashed_pass" => "Your current password is incorrect",
'dumbpwd' => 'That password is too common.',
"statuslabel_type" => "You must select a valid status label type",
"unique_undeleted" => "The :attribute must be unique.",
],
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -96,6 +131,6 @@ return array(
| |
*/ */
'attributes' => array(), 'attributes' => [],
); );

2
resources/views/users/edit.blade.php
View file

@ -126,6 +126,8 @@
@endif @endif
@else @else
(Managed via LDAP) (Managed via LDAP)
<input type="hidden" name="username" value="{{ Input::old('username', $user->username) }}">
@endif @endif
{!! $errors->first('username', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('username', '<span class="alert-msg">:message</span>') !!}