hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 15:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

PHRAS-3596 Prod - Expose client - filtering expose and more change due to ps expose refactoring (#4196)

Browse Source 
* expose client capabilities

* some ux improve

* some fix

* editable filter

* add enable information
This commit is contained in:
Aina Sitraka
2022-12-20 18:17:18 +03:00
committed by GitHub
parent a892887dd2
commit 8c1f035dac
23 changed files with 335 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
lib/Alchemy/Phrasea/PhraseanetService/Controller/PSExposeController.php
View File

@@ -61,9 +61,16 @@ class PSExposeController extends Controller
}
if ($response->getStatusCode() !== 200) {
try {
$b = json_decode($response->getBody()->getContents(),true);
$message = $b['error_description'];
} catch (\Exception $e) {
$message = 'Error with status code: ' . $response->getStatusCode();
}
return $this->app->json([
'success' => false,
'error_description' => 'Error with status code: ' . $response->getStatusCode(),
'error_description' => $message
]);
}
@@ -220,7 +227,16 @@ class PSExposeController extends Controller
$exposeClient = $proxyConfig->getClientWithOptions($clientOptions);
try {
$response = $exposeClient->get('/publications?flatten=true&order[createdAt]=desc', [
$uri = '/publications?flatten=true&order[createdAt]=desc';
if ($request->get('mine')) {
$uri .= '&mine=true';
}
if ($request->get('editable')) {
$uri .= '&editable=true';
}
$response = $exposeClient->get($uri, [
'headers' => [
'Authorization' => 'Bearer '. $accessToken,
'Content-Type' => 'application/json'
@@ -476,10 +492,12 @@ class PSExposeController extends Controller
}
return $this->render("prod/WorkZone/ExposePublicationAssets.html.twig", [
'pubAssets' => $pubAssets,
'publicationId' => $request->get('publicationId'),
'totalItems' => $totalItems,
'page' => $page
'pubAssets' => $pubAssets,
'publicationId' => $request->get('publicationId'),
'capabilitiesDelete' => $request->get('capabilitiesDelete'),
'capabilitiesEdit' => $request->get('capabilitiesEdit'),
'totalItems' => $totalItems,
'page' => $page
]);
}
@@ -1165,11 +1183,11 @@ class PSExposeController extends Controller
}
foreach ($permissions as &$permission) {
if ($permission['userType'] == 'user') {
if ($permission['userType'] == 'user' && !empty($listUsers)) {
$key = array_search($permission['userId'], array_column($listUsers, 'id'));
$permission = array_merge($permission, $listUsers[$key]);
$listUsers[$key]['selected'] = true;
} elseif ($permission['userType'] == 'group') {
} elseif ($permission['userType'] == 'group' && !empty($listGroups)) {
$key = array_search($permission['userId'], array_column($listGroups, 'id'));
$permission = array_merge($permission, $listGroups[$key]);
$listGroups[$key]['selected'] = true;