Merge branch 'develop' of https://github.com/snipe/snipe-it into develop

This commit is contained in:
snipe 2022-01-21 12:33:53 -08:00
commit eade041b6e
2 changed files with 5 additions and 3 deletions

View file

@ -17,6 +17,10 @@ class CustomFieldSetDefaultValuesForModel extends Component
public function mount()
{
if(is_null($this->model_id)){
return;
}
$this->model = AssetModel::find($this->model_id); // It's possible to do some clever route-model binding here, but let's keep it simple, shall we?
$this->fieldset_id = $this->model->fieldset_id;

View file

@ -34,9 +34,7 @@
</div>
<!-- Custom Fieldset -->
@if (isset($item->id))
@livewire('custom-field-set-default-values-for-model',["model_id" => $item->id])
@endif
@livewire('custom-field-set-default-values-for-model',["model_id" => $item->id])
@include ('partials.forms.edit.notes')
@include ('partials.forms.edit.requestable', ['requestable_text' => trans('admin/models/general.requestable')])