Merge branch 'mika' into dev

2023-11-24 17:11:30 +01:00
parent 41bf03682c 4674c75a9f
commit a6ca0d04ec
10 changed files with 752 additions and 18 deletions
--- a/grpcapi/grpcapi.go
+++ b/grpcapi/grpcapi.go
@@ -55,7 +55,8 @@ func (s FleetsServerImpl) GetVehicle(ctx context.Context, req *GetVehicleRequest

 func (s FleetsServerImpl) GetVehicles(ctx context.Context, req *GetVehiclesRequest) (*GetVehiclesResponse, error) {
 	filter := storage.VehicleFilters{
-		Types: req.Types,
+		Types:          req.Types,
+		Administrators: req.Administrators,
 	}
 	if req.AvailabilityFrom.IsValid() {
 		filter.AvailableFrom = req.AvailabilityFrom.AsTime()