Andrey
/
QR_code_generator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor fixes

master
Константин 2023-10-25 11:57:49 +03:00
parent 6a09091b8a
commit 565dbd93ec
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/Api/Companies/MembersController.php
View File

@ -24,6 +24,7 @@ class MembersController extends Controller {
$query = $this->model->query(); $query = $this->model->query();
$service = FiltersService::getService('companyMembers'); $service = FiltersService::getService('companyMembers');
$service->applyFilters($query, $filters); $service->applyFilters($query, $filters);
$query->leftJoin('users', 'user_id', '=', 'users.id')->orderBy('name');
$paginator = $query->paginate(config('app.pagination_limit')); $paginator = $query->paginate(config('app.pagination_limit'));
return fractal($paginator, new CompanyMemberTransformer())->respond(); return fractal($paginator, new CompanyMemberTransformer())->respond();
} }

2
app/Transformers/Objects/ObjectPropertyTransformer.php
View File

@ -42,7 +42,7 @@ class ObjectPropertyTransformer extends TransformerAbstract {
public function includeValue(Field $model) { public function includeValue(Field $model) {
if ($value = $model->getValue($this->object->id)) { 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); 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)]); else return $this->primitive(['data' => $model->getValue($this->object->id)]);
} }
return null; return null;