diff --git a/app/Http/Controllers/Api/Companies/MembersController.php b/app/Http/Controllers/Api/Companies/MembersController.php index 819587e..6aceec6 100644 --- a/app/Http/Controllers/Api/Companies/MembersController.php +++ b/app/Http/Controllers/Api/Companies/MembersController.php @@ -24,6 +24,7 @@ class MembersController extends Controller { $query = $this->model->query(); $service = FiltersService::getService('companyMembers'); $service->applyFilters($query, $filters); + $query->leftJoin('users', 'user_id', '=', 'users.id')->orderBy('name'); $paginator = $query->paginate(config('app.pagination_limit')); return fractal($paginator, new CompanyMemberTransformer())->respond(); } diff --git a/app/Transformers/Objects/ObjectPropertyTransformer.php b/app/Transformers/Objects/ObjectPropertyTransformer.php index 325b426..6260a29 100644 --- a/app/Transformers/Objects/ObjectPropertyTransformer.php +++ b/app/Transformers/Objects/ObjectPropertyTransformer.php @@ -42,7 +42,7 @@ class ObjectPropertyTransformer extends TransformerAbstract { public function includeValue(Field $model) { if ($value = $model->getValue($this->object->id)) { if ($model->type === FieldType::RELATION) return $this->collection($value->filter(function($val) {return !is_null($val);}), $model->transformer); - elseif (in_array($model->type, [FieldType::DOCUMENT, FieldType::IMAGE])) return $this->collection($value, new AssetTransformer()); + elseif (in_array($model->type, [FieldType::DOCUMENT, FieldType::IMAGE])) return $this->collection($value->filter(function($val) {return !is_null($val);}), new AssetTransformer()); else return $this->primitive(['data' => $model->getValue($this->object->id)]); } return null;