Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EZP-31668: Introduced new key for user related pagination configuration #72

Merged
merged 2 commits into from
Jun 15, 2020
Merged

EZP-31668: Introduced new key for user related pagination configuration #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9bfe1e
EZP-31668: Introduced new key for user related pagination configuration
ViniTou Jun 4, 2020
595fe45
EZP-30936: Updated comment example
ViniTou Jun 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 6 additions & 11 deletions src/bundle/DependencyInjection/Configuration/Parser/Pagination.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,17 @@
* ezpublish:
* system:
* default: # configuration per siteaccess or siteaccess group
* pagination:
* pagination_user:
* user_settings_limit: 10
* ```
*/
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please update also a key for pagination_user in comment above

class Pagination extends AbstractParser
{
/**
* Adds semantic configuration definition.
*
* @param \Symfony\Component\Config\Definition\Builder\NodeBuilder $nodeBuilder Node just under ezpublish.system.<siteaccess>
*/
public function addSemanticConfig(NodeBuilder $nodeBuilder)
{
$nodeBuilder
->arrayNode('pagination')
->info('System pagination configuration')
->arrayNode('pagination_user')
->info('user related pagination configuration')
->children()
->scalarNode('user_settings_limit')->isRequired()->end()
->end()
Expand All @@ -47,11 +42,11 @@ public function addSemanticConfig(NodeBuilder $nodeBuilder)
*/
public function mapConfig(array &$scopeSettings, $currentScope, ContextualizerInterface $contextualizer): void
{
if (empty($scopeSettings['pagination'])) {
if (empty($scopeSettings['pagination_user'])) {
return;
}

$settings = $scopeSettings['pagination'];
$settings = $scopeSettings['pagination_user'];
$keys = [
'user_settings_limit',
];
Expand All @@ -62,7 +57,7 @@ public function mapConfig(array &$scopeSettings, $currentScope, ContextualizerIn
}

$contextualizer->setContextualParameter(
sprintf('pagination.%s', $key),
sprintf('pagination_user.%s', $key),
$currentScope,
$settings[$key]
);
Expand Down
2 changes: 1 addition & 1 deletion src/bundle/Resources/config/ezplatform_default_settings.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,4 @@ parameters:
ezsettings.default.user_preferences.additional_translations: []

# Pagination limits
ezsettings.default.pagination.user_settings_limit: 10
ezsettings.default.pagination_user.user_settings_limit: 10
2 changes: 1 addition & 1 deletion src/bundle/Resources/config/services/controllers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ services:
EzSystems\EzPlatformUserBundle\Controller\UserSettingsController:
parent: EzSystems\EzPlatformAdminUiBundle\Controller\Controller
arguments:
$defaultPaginationLimit: '$pagination.user_settings_limit$'
$defaultPaginationLimit: '$pagination_user.user_settings_limit$'