DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 07:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #10545 from inietov/fixes/unable_to_add_asset_model

Browse source 
Fixes #10536 Unable to add asset model (v6.0.0-RC-1)
This commit is contained in:
snipe 2022-01-21 10:13:10 -08:00 committed by GitHub
parent a26119c262 7383ec7f1e
commit 8813f55770
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Http/Livewire/CustomFieldSetDefaultValuesForModel.php
View file

@ -17,6 +17,10 @@ class CustomFieldSetDefaultValuesForModel extends Component
public function mount() 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->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; $this->fieldset_id = $this->model->fieldset_id;

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

@ -34,9 +34,7 @@
</div> </div>
<!-- Custom Fieldset --> <!-- Custom Fieldset -->
@if (isset($item->id))
@livewire('custom-field-set-default-values-for-model',["model_id" => $item->id]) @livewire('custom-field-set-default-values-for-model',["model_id" => $item->id])
@endif
@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')])