mirror of
https://github.com/snipe/snipe-it.git
synced 2025-03-05 20:52:15 -08:00
Merge pull request #16381 from marcusmoore/chore/migrate-checkbox-helpers-pt9
Replace calls to Form::checkbox pt9
This commit is contained in:
commit
8486256142
|
@ -12,11 +12,11 @@ class CategoryEditForm extends Component
|
||||||
|
|
||||||
public $originalSendCheckInEmailValue;
|
public $originalSendCheckInEmailValue;
|
||||||
|
|
||||||
public $requireAcceptance;
|
public bool $requireAcceptance;
|
||||||
|
|
||||||
public $sendCheckInEmail;
|
public bool $sendCheckInEmail;
|
||||||
|
|
||||||
public $useDefaultEula;
|
public bool $useDefaultEula;
|
||||||
|
|
||||||
public function mount()
|
public function mount()
|
||||||
{
|
{
|
||||||
|
|
|
@ -26,9 +26,9 @@
|
||||||
<livewire:category-edit-form
|
<livewire:category-edit-form
|
||||||
:default-eula-text="$snipeSettings->default_eula_text"
|
:default-eula-text="$snipeSettings->default_eula_text"
|
||||||
:eula-text="old('eula_text', $item->eula_text)"
|
:eula-text="old('eula_text', $item->eula_text)"
|
||||||
:require-acceptance="old('require_acceptance', $item->require_acceptance)"
|
:require-acceptance="(bool) old('require_acceptance', $item->require_acceptance)"
|
||||||
:send-check-in-email="old('checkin_email', $item->checkin_email)"
|
:send-check-in-email="(bool) old('checkin_email', $item->checkin_email)"
|
||||||
:use-default-eula="old('use_default_eula', $item->use_default_eula)"
|
:use-default-eula="(bool) old('use_default_eula', $item->use_default_eula)"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
@include ('partials.forms.edit.image-upload', ['image_path' => app('categories_upload_path')])
|
@include ('partials.forms.edit.image-upload', ['image_path' => app('categories_upload_path')])
|
||||||
|
|
|
@ -23,12 +23,25 @@
|
||||||
<div class="col-md-9 col-md-offset-3">
|
<div class="col-md-9 col-md-offset-3">
|
||||||
@if ($defaultEulaText!='')
|
@if ($defaultEulaText!='')
|
||||||
<label class="form-control">
|
<label class="form-control">
|
||||||
{{ Form::checkbox('use_default_eula', '1', $useDefaultEula, ['wire:model.live' => 'useDefaultEula', 'aria-label'=>'use_default_eula']) }}
|
<input
|
||||||
|
type="checkbox"
|
||||||
|
name="use_default_eula"
|
||||||
|
value="1"
|
||||||
|
wire:model.live="useDefaultEula"
|
||||||
|
aria-label="use_default_eula"
|
||||||
|
/>
|
||||||
<span>{!! trans('admin/categories/general.use_default_eula') !!}</span>
|
<span>{!! trans('admin/categories/general.use_default_eula') !!}</span>
|
||||||
</label>
|
</label>
|
||||||
@else
|
@else
|
||||||
<label class="form-control form-control--disabled">
|
<label class="form-control form-control--disabled">
|
||||||
{{ Form::checkbox('use_default_eula', '0', $useDefaultEula, ['wire:model.live' => 'useDefaultEula', 'class'=>'disabled','disabled' => 'disabled', 'aria-label'=>'use_default_eula']) }}
|
<input
|
||||||
|
type="checkbox"
|
||||||
|
name="use_default_eula"
|
||||||
|
value="0"
|
||||||
|
wire:model.live="useDefaultEula"
|
||||||
|
aria-label="use_default_eula"
|
||||||
|
disabled
|
||||||
|
/>
|
||||||
<span>{!! trans('admin/categories/general.use_default_eula_disabled') !!}</span>
|
<span>{!! trans('admin/categories/general.use_default_eula_disabled') !!}</span>
|
||||||
</label>
|
</label>
|
||||||
@endif
|
@endif
|
||||||
|
@ -39,7 +52,13 @@
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<div class="col-md-9 col-md-offset-3">
|
<div class="col-md-9 col-md-offset-3">
|
||||||
<label class="form-control">
|
<label class="form-control">
|
||||||
{{ Form::checkbox('require_acceptance', '1', $requireAcceptance, ['wire:model.live' => 'requireAcceptance', 'aria-label'=>'require_acceptance']) }}
|
<input
|
||||||
|
type="checkbox"
|
||||||
|
name="require_acceptance"
|
||||||
|
value="1"
|
||||||
|
wire:model.live="requireAcceptance"
|
||||||
|
aria-label="require_acceptance"
|
||||||
|
/>
|
||||||
{{ trans('admin/categories/general.require_acceptance') }}
|
{{ trans('admin/categories/general.require_acceptance') }}
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
|
@ -49,7 +68,14 @@
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<div class="col-md-9 col-md-offset-3">
|
<div class="col-md-9 col-md-offset-3">
|
||||||
<label class="form-control">
|
<label class="form-control">
|
||||||
{{ Form::checkbox('checkin_email', '1', $sendCheckInEmail, ['wire:model.live' => 'sendCheckInEmail', 'aria-label'=>'checkin_email', 'disabled' => $this->sendCheckInEmailDisabled]) }}
|
<input
|
||||||
|
type="checkbox"
|
||||||
|
name="checkin_email"
|
||||||
|
value="1"
|
||||||
|
wire:model.live="sendCheckInEmail"
|
||||||
|
aria-label="checkin_email"
|
||||||
|
@disabled($this->sendCheckInEmailDisabled)
|
||||||
|
/>
|
||||||
{{ trans('admin/categories/general.checkin_email') }}
|
{{ trans('admin/categories/general.checkin_email') }}
|
||||||
</label>
|
</label>
|
||||||
@if ($this->shouldDisplayEmailMessage)
|
@if ($this->shouldDisplayEmailMessage)
|
||||||
|
|
|
@ -10,7 +10,10 @@ class CategoryEditFormTest extends TestCase
|
||||||
{
|
{
|
||||||
public function testTheComponentCanRender()
|
public function testTheComponentCanRender()
|
||||||
{
|
{
|
||||||
Livewire::test(CategoryEditForm::class)->assertStatus(200);
|
Livewire::test(CategoryEditForm::class, [
|
||||||
|
'sendCheckInEmail' => true,
|
||||||
|
'useDefaultEula' => true,
|
||||||
|
])->assertStatus(200);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testSendEmailCheckboxIsCheckedOnLoadWhenSendEmailIsExistingSetting()
|
public function testSendEmailCheckboxIsCheckedOnLoadWhenSendEmailIsExistingSetting()
|
||||||
|
|
Loading…
Reference in a new issue