lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge pull request #4 from snipe/develop

Browse source 
Merge current develop into branch
This commit is contained in:
Nuraeil 2021-11-18 21:30:45 +01:00 • committed by GitHub
commit 7084703b5a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -19,13 +19,22 @@ class CustomFieldSetDefaultValuesForModel extends Component
{ {
$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;
$this->fields = CustomFieldset::find($this->fieldset_id)->fields;
$this->add_default_values = ( $this->model->defaultValues->count() > 0); $this->fields = null;
if ($fieldset = CustomFieldset::find($this->fieldset_id)) {
$this->fields = CustomFieldset::find($this->fieldset_id)->fields;
}
$this->add_default_values = ($this->model->defaultValues->count() > 0);
} }
public function updatedFieldsetId() public function updatedFieldsetId()
{ {
$this->fields = CustomFieldset::find($this->fieldset_id)->fields; if (CustomFieldset::find($this->fieldset_id)) {
$this->fields = CustomFieldset::find($this->fieldset_id)->fields;
}
} }
public function render() public function render()

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

@ -12,9 +12,10 @@
</span> </span>
</div> </div>
</div> </div>
@if( $this->add_default_values ) {{-- 'if the checkbox is enabled *AND* there are more than 0 fields in the fieldsset' --}} @if ($this->add_default_values ) {{-- 'if the checkbox is enabled *AND* there are more than 0 fields in the fieldsset' --}}
<div> <div>
<div class="form-group"> <div class="form-group">
@if ($fields)
@foreach ($fields as $field) @foreach ($fields as $field)
<div class="form-group"> <div class="form-group">
@ -49,6 +50,7 @@
</div> </div>
@endforeach @endforeach
@endif
</div> </div>
</div> </div>