Skip to content

Commit 1fed41f

Browse files
authored
Merge branch 'main' into copilot/fix-4
2 parents 2ed223b + 48c11f9 commit 1fed41f

3 files changed

Lines changed: 5 additions & 3 deletions

File tree

backend/src/inventory/device/device-db.service.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ export class DeviceDbService {
5555
query = this.searchQueryBuilder(query, searchTerm);
5656
}
5757

58+
if (searchTerm) {
59+
query = this.searchQueryBuilder(query, searchTerm);
60+
}
61+
5862
if (sortCol) {
5963
if (sortCol.startsWith('type.')) {
6064
query = query.orderBy(

frontend/src/app/pages/inventory/devices/device-create/device-create.component.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,7 @@ <h1>Geräte erstellen</h1>
8888
nzPlaceHolder="Geräte-Gruppe auswählen"
8989
nzAllowClear
9090
nzShowSearch
91-
nzServerSearch
92-
[nzLoading]="deviceGroupsIsLoading()">
91+
nzServerSearch>
9392
@if (deviceGroupsIsLoading()) {
9493
<nz-spin></nz-spin>
9594
} @else {

frontend/src/app/pages/inventory/devices/device-detail/device-detail.service.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ export class DeviceDetailService {
4949
locationSearch = '';
5050
locations = signal<LocationDto[]>([]);
5151
locationsIsLoading = signal(false);
52-
5352
uploadIds: { imageId: string, fileId: string }[] = [];
5453

5554
constructor(

0 commit comments

Comments
 (0)