From 3071a83ae0fde758c477687dec07b693997fc8c1 Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 3 Jun 2022 12:00:56 -0700 Subject: [PATCH 1/2] Added the validation strings for user creation password options Signed-off-by: snipe --- resources/lang/en/validation.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index 5f097b717c..e7a87aed07 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -91,6 +91,11 @@ return [ 'url' => 'The :attribute format is invalid.', 'unique_undeleted' => 'The :attribute must be unique.', 'non_circular' => 'The :attribute must not create a circular reference.', + 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.', + 'letters' => 'Password must contain at least one letter.', + 'numbers' => 'Password must contain at least one number.', + 'case_diff' => 'Password must use mixed case.', + 'symbols' => 'Password must contain symbols.', 'gte' => [ 'numeric' => 'Value cannot be negative' ], From 36f714e4147b477e234a4264aae451f94aace52d Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 3 Jun 2022 12:52:53 -0700 Subject: [PATCH 2/2] Updated Asset Model gate to correctly display the button on view Signed-off-by: snipe --- resources/views/models/view.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/models/view.blade.php b/resources/views/models/view.blade.php index 96fef52f58..3a4ddca44a 100755 --- a/resources/views/models/view.blade.php +++ b/resources/views/models/view.blade.php @@ -8,7 +8,7 @@ @stop @section('header_right') - @can('superuser') + @can('update', \App\Models\AssetModel::class)