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

Merge remote-tracking branch 'origin/master'

master
Константин 2023-07-24 22:16:01 +03:00
parent 9f0f5cee3e 23bf227650
commit fcfc985671
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Http/Controllers/Api/Publications/PublicationsController.php
View File

@ -28,11 +28,12 @@ class PublicationsController extends Controller {
$query = $this->model->query()->orderBy('published_at', 'desc'); $query = $this->model->query()->orderBy('published_at', 'desc');
$user = Auth::user(); $user = Auth::user();
if (!($user->isAdmin ?? null)) $query->where(['is_published' => true]); if (!($user->isAdmin ?? null)) $query->where(['is_published' => true]);
if ($page = Page::byUuid($request->get('page_id'))->first()) $query->where(['page_id' => $page->id]);
// if ($page = Page::query()->where(['sub_type' => $request->get('sub_type')])->first()) { if ($page = Page::byUuid($request->get('page_id'))->first()) {
// $query->where('page_id', $page->id); $query->where(['page_id' => $page->id]);
// } } elseif ($page = Page::query()->where(['sub_type' => $request->get('sub_type')])->first()) {
$query->where('page_id', $page->id);
}
$paginator = $query->paginate(config('app.pagination_limit')); $paginator = $query->paginate(config('app.pagination_limit'));
return fractal($paginator, new PublicationTransformer())->respond(); return fractal($paginator, new PublicationTransformer())->respond();
} }

1
app/Services/Forms/Publications/PublicationNewsForms.php
View File

@ -54,6 +54,7 @@ class PublicationNewsForms extends FormsService {
'name' => 'poster_id', 'name' => 'poster_id',
'title' => 'Превью', 'title' => 'Превью',
'type' => FieldType::IMAGE, 'type' => FieldType::IMAGE,
'required' => true,
'value' => ($model->poster ?? null) ? fractal($model->poster, new AssetTransformer()) : null 'value' => ($model->poster ?? null) ? fractal($model->poster, new AssetTransformer()) : null
] ]
]; ];

2
app/Services/Forms/Publications/PublicationPhotosForms.php
View File

@ -33,7 +33,7 @@ class PublicationPhotosForms
if (empty($params->assets)) { if (empty($params->assets)) {
$assets = []; $assets = [];
} else { } else {
$models = Asset::query()->whereIn('uuid', $params->assets)->get(); $models = Asset::query()->whereIn('uuid', $params->assets)->orderBy('id')->get();
$assets = fractal($models, new AssetTransformer()); $assets = fractal($models, new AssetTransformer());
} }

2
app/Transformers/Publications/PublicationTransformer.php
View File

@ -44,7 +44,7 @@ class PublicationTransformer extends TransformerAbstract {
]; ];
if ($model->parsedType['name'] === PublicationType::PHOTOS && $params->assets) { if ($model->parsedType['name'] === PublicationType::PHOTOS && $params->assets) {
$models = Asset::query()->whereIn('uuid', $params->assets)->get(); $models = Asset::query()->whereIn('uuid', $params->assets)->orderBy('id')->get();
$result['assets'] = fractal($models, new AssetTransformer()); $result['assets'] = fractal($models, new AssetTransformer());
} }