DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-21 03:15:45 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Implement model filtering for selectValue method

Browse source
This commit is contained in:
Marcus Moore 2023-12-21 13:03:43 -08:00
parent 1dd9273f70
commit 62f8353bd7
No known key found for this signature in database
3 changed files with 31 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/Models/ReportTemplate.php
View file

@ -60,8 +60,15 @@ class ReportTemplate extends Model
return null; return null;
} }
public function selectValue(string $property) public function selectValue(string $property, string $model = null)
{ {
// If a model is provided then we should ensure we only return
// the value if the model still exists.
if ($model) {
$foundModel = $model::find($this->options[$property]);
return $foundModel ? $foundModel->id : null;
}
return $this->options[$property] ?? null; return $this->options[$property] ?? null;
} }

2
resources/views/reports/custom.blade.php
View file

@ -300,7 +300,7 @@
'translated_name' => trans('general.department'), 'translated_name' => trans('general.department'),
'fieldname' => 'by_dept_id', 'fieldname' => 'by_dept_id',
'hide_new' => 'true', 'hide_new' => 'true',
'selected' => $reportTemplate->selectValue('by_dept_id') 'selected' => $reportTemplate->selectValue('by_dept_id', \App\Models\Department::class)
]) ])
@include ('partials.forms.edit.supplier-select', [ @include ('partials.forms.edit.supplier-select', [
'translated_name' => trans('general.supplier'), 'translated_name' => trans('general.supplier'),

24
tests/Unit/ReportTemplateTest.php
View file

@ -79,9 +79,29 @@ class ReportTemplateTest extends TestCase
public function testSelectValueDoesNotIncludeDeletedOrNonExistentModels() public function testSelectValueDoesNotIncludeDeletedOrNonExistentModels()
{ {
$this->markTestIncomplete(); [$locationA, $locationB] = Location::factory()->count(2)->create();
$invalidId = 10000;
// @todo: maybe it should optionally include deleted values? $templateWithValidId = ReportTemplate::factory()->create([
'options' => ['single_value' => $locationA->id],
]);
$templateWithDeletedId = ReportTemplate::factory()->create([
'options' => ['single_value' => $locationB->id],
]);
$locationB->delete();
$templateWithInvalidId = ReportTemplate::factory()->create([
'options' => ['single_value' => $invalidId],
]);
$this->assertEquals(
$locationA->id,
$templateWithValidId->selectValue('single_value', Location::class)
);
$this->assertNull($templateWithDeletedId->selectValue('single_value', Location::class));
$this->assertNull($templateWithInvalidId->selectValue('single_value', Location::class));
} }
public function testSelectValuesDoNotIncludeDeletedOrNonExistentModels() public function testSelectValuesDoNotIncludeDeletedOrNonExistentModels()