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

working! need formatting for error messages etc

Browse source
This commit is contained in:
spencerrlongg 2024-09-25 14:00:50 -05:00
parent f3ad89931f
commit 9df78a9ed0
3 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/Livewire/CustomFieldSetDefaultValuesForModel.php
View file

@ -24,7 +24,15 @@ class CustomFieldSetDefaultValuesForModel extends Component
$this->fieldset_id = $this->model?->fieldset_id; $this->fieldset_id = $this->model?->fieldset_id;
$this->add_default_values = ($this->model?->defaultValues->count() > 0); $this->add_default_values = ($this->model?->defaultValues->count() > 0);
$this->initializeSelectedValuesArray(); $this->initializeSelectedValuesArray();
if (session()->has('errors')) {
$errors = session('errors')->keys();
$selectedValuesKeys = array_keys($this->selectedValues);
if (count(array_intersect($selectedValuesKeys, $errors)) > 0) {
$this->add_default_values = true;
};
}
$this->populatedSelectedValuesArray(); $this->populatedSelectedValuesArray();
} }

6
resources/views/livewire/custom-field-set-default-values-for-model.blade.php
View file

@ -11,6 +11,7 @@
<div class="col-md-3"> <div class="col-md-3">
@if ($fieldset_id) @if ($fieldset_id)
<label class="form-control"> <label class="form-control">
{{ Form::checkbox('add_default_values', 1, old('add_default_values', $add_default_values), ['data-livewire-component' => $this->getId(), 'id' => 'add_default_values', 'wire:model.live' => 'add_default_values', 'disabled' => $this->fields->isEmpty()]) }} {{ Form::checkbox('add_default_values', 1, old('add_default_values', $add_default_values), ['data-livewire-component' => $this->getId(), 'id' => 'add_default_values', 'wire:model.live' => 'add_default_values', 'disabled' => $this->fields->isEmpty()]) }}
{{ trans('admin/models/general.add_default_values') }} {{ trans('admin/models/general.add_default_values') }}
</label> </label>
@ -18,8 +19,9 @@
</div> </div>
</div> </div>
@if ($add_default_values || $errors->count() > 0) @if ($add_default_values)
@if ($this->fields)
@if ($this->fields)
@foreach ($this->fields as $field) @foreach ($this->fields as $field)
@if($errors->has($field->db_column_name())) @if($errors->has($field->db_column_name()))

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

@ -36,7 +36,7 @@
<!-- Custom Fieldset --> <!-- Custom Fieldset -->
<!-- If $item->id is null we are cloning the model and we need the $model_id variable --> <!-- If $item->id is null we are cloning the model and we need the $model_id variable -->
@livewire('custom-field-set-default-values-for-model', ["model_id" => $item->id ?? $model_id ?? null, "errors" => $errors]) @livewire('custom-field-set-default-values-for-model', ["model_id" => $item->id ?? $model_id ?? null])
@include ('partials.forms.edit.notes') @include ('partials.forms.edit.notes')
@include ('partials.forms.edit.requestable', ['requestable_text' => trans('admin/models/general.requestable')]) @include ('partials.forms.edit.requestable', ['requestable_text' => trans('admin/models/general.requestable')])