diff --git a/src/Controller/APIController.php b/src/Controller/APIController.php index acf3cb74..aab55e4a 100644 --- a/src/Controller/APIController.php +++ b/src/Controller/APIController.php @@ -423,7 +423,8 @@ class APIController extends Controller { $vlist[] = [ 'id' => $v->getID(), - 'make' => $v->getMake() . ' ' . $v->getModelYearFrom() . '-' . $v->getModelYearTo(), + 'make' => trim($v->getMake() . ' ' . $v->getModelYearFormatted(false)), + // 'make' => $v->getMake() . ' ' . $v->getModelYearFrom() . '-' . $v->getModelYearTo(), ]; } diff --git a/src/Entity/Vehicle.php b/src/Entity/Vehicle.php index 05e05897..f751b473 100644 --- a/src/Entity/Vehicle.php +++ b/src/Entity/Vehicle.php @@ -114,12 +114,17 @@ class Vehicle return $this->model_year_to; } - public function getModelYearFormatted() + public function getModelYearFormatted($has_dash = true) { if ($this->model_year_from == 0) { if ($this->model_year_to == 0) - return '-'; + { + if ($has_dash) + return '-'; + + return ''; + } return $this->model_year_to; }