Skip to content

IBX-7044: Redirect after settings update #1173

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

Open
Gengar-i wants to merge 10 commits into
base: 4.6
Choose a base branch
from
Open

IBX-7044: Redirect after settings update #1173

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
32100d0
IBX-7044: Redirect after settings update
Gengar-i Feb 14, 2024
404282d
Remove javascript block
Gengar-i Feb 14, 2024
ae9ccbf
Fix route options parameter
Gengar-i Feb 20, 2024
b11457d
Variables url updated
Gengar-i Feb 20, 2024
b4ef757
Removed parameters
Gengar-i Mar 18, 2024
1f867ac
Added routeParameters to custom route
Gengar-i Apr 5, 2024
75d271c
Added route check
Steveb-p Apr 9, 2024
045f5e7
Added route check
Steveb-p Apr 9, 2024
810e9e3
Update src/bundle/Resources/views/themes/admin/account/settings/updat…
Steveb-p Jul 9, 2024
2324c2e
Update src/bundle/Resources/views/themes/admin/account/settings/updat…
Steveb-p Jul 9, 2024
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
12 changes: 11 additions & 1 deletion src/bundle/Resources/views/themes/admin/account/settings/update.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,17 @@
{% block body_class %}ibexa-user-settings-update-view{% endblock %}

{% block header %}
{% set user_setting_update_sidebar_right = knp_menu_get('ezplatform_admin_ui.menu.user_setting_update.sidebar_right', [], {'user_setting': user_setting}) %}
{% set route = app.request.query.get('route')|default(null) %}
{% set content_id = app.request.query.get('contentId')|default(null) %}
{% set version_no = app.request.query.get('versionNo')|default(null) %}
{% set language = app.request.query.get('language')|default(null) %}
{% set user_setting_update_sidebar_right = knp_menu_get('ezplatform_admin_ui.menu.user_setting_update.sidebar_right', [], {
'route': route,
'content_id': content_id,
'version_no': version_no,
'language': language,
'user_setting': user_setting,
}) %}

{% include '@ibexadesign/ui/edit_header.html.twig' with {
action_name: 'list.action_name'|trans({'%action%': title|lower})|desc('Editing %action%'),
Expand Down
16 changes: 14 additions & 2 deletions src/lib/Menu/UserSetting/UserSettingUpdateRightSidebarBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ public function createStructure(array $options): ItemInterface
{
/** @var \Knp\Menu\ItemInterface|\Knp\Menu\ItemInterface[] $menu */
$menu = $this->factory->createItem('root');
$route = $options['route'] ?? 'ibexa.user_settings.list';

$saveItem = $this->createMenuItem(
self::ITEM__SAVE,
Expand All @@ -69,7 +70,13 @@ public function createStructure(array $options): ItemInterface
'class' => 'ibexa-btn--trigger',
'data-click' => '#user_setting_update_update',
],
]
'route' => $route,
'routeParameters' => [
'contentId' => $options['content_id'] ?? null,
'versionNo' => $options['version_no'] ?? null,
'language' => $options['language'] ?? null,
],
],
);

$saveItem->addChild(
Expand All @@ -90,7 +97,12 @@ public function createStructure(array $options): ItemInterface
self::ITEM__CANCEL => $this->createMenuItem(
self::ITEM__CANCEL,
[
'route' => 'ibexa.user_settings.list',
'route' => $route,
'routeParameters' => [
'contentId' => $options['content_id'] ?? null,
'versionNo' => $options['version_no'] ?? null,
'language' => $options['language'] ?? null,
],
]
),
]);
Expand Down