ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #17010 from marcusmoore/chore/replace-two-factor-select-macro

Browse Source 
Replace `two_factor_options` macro
This commit is contained in:
snipe
2025-05-29 13:07:23 +01:00
committed by GitHub
parent 577b5586b4 3c428f2d7b
commit 75a839cc21
2 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
resources/macros/macros.php
View File

@@ -220,24 +220,6 @@ Form::macro('username_format', function ($name = 'username_format', $selected =
return $select;
});
Form::macro('two_factor_options', function ($name = 'two_factor_enabled', $selected = null, $class = null) {
$formats = [
'' => trans('admin/settings/general.two_factor_disabled'),
'1' => trans('admin/settings/general.two_factor_optional'),
'2' => trans('admin/settings/general.two_factor_required'),
];
$select = '<select name="'.$name.'" class="'.$class.'" aria-label="'.$name.'">';
foreach ($formats as $format => $label) {
$select .= '<option value="'.$format.'"'.($selected == $format ? ' selected="selected" role="option" aria-selected="true"' : ' aria-selected="false"').'>'.$label.'</option> '."\n";
}
$select .= '</select>';
return $select;
});
Form::macro('customfield_elements', function ($name = 'customfield_elements', $selected = null, $class = null) {
$formats = [
'text' => 'Text Box',

11
resources/views/settings/security.blade.php
View File

@@ -48,8 +48,15 @@
<label for="two_factor_enabled">{{ trans('admin/settings/general.two_factor_enabled_text') }}</label>
</div>
<div class="col-md-9">
{!! Form::two_factor_options('two_factor_enabled', old('two_factor_enabled', $setting->two_factor_enabled), 'select2') !!}
<x-input.select
name="two_factor_enabled"
:selected="old('two_factor_enabled', $setting->two_factor_enabled)"
:options="[
'' => trans('admin/settings/general.two_factor_disabled'),
'1' => trans('admin/settings/general.two_factor_optional'),
'2' => trans('admin/settings/general.two_factor_required'),
]"
/>
<p class="help-block">{{ trans('admin/settings/general.two_factor_enabled_warning') }}</p>
@if (config('app.lock_passwords'))