Skip to content

Commit 170e8e9

Browse files
committed
IBX-7044: Redirect after settings update
1 parent 526fc99 commit 170e8e9

File tree

2 files changed

+30
-3
lines changed

2 files changed

+30
-3
lines changed

src/bundle/Resources/views/themes/admin/account/settings/update.html.twig

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,17 @@
66
{% block body_class %}ibexa-user-settings-update-view{% endblock %}
77

88
{% block header %}
9-
{% set user_setting_update_sidebar_right = knp_menu_get('ezplatform_admin_ui.menu.user_setting_update.sidebar_right', [], {'user_setting': user_setting}) %}
9+
{% set route = app.request.query.get('route')|default(null) %}
10+
{% set content_id = app.request.query.get('content_id')|default(null) %}
11+
{% set version = app.request.query.get('version')|default(null) %}
12+
{% set language = app.request.query.get('language')|default(null) %}
13+
{% set user_setting_update_sidebar_right = knp_menu_get('ezplatform_admin_ui.menu.user_setting_update.sidebar_right', [], {
14+
'route': route,
15+
'content_id': content_id,
16+
'version_no': version,
17+
'language': language,
18+
'user_setting': user_setting,
19+
}) %}
1020

1121
{% include '@ibexadesign/ui/edit_header.html.twig' with {
1222
action_name: 'list.action_name'|trans({'%action%': title|lower})|desc('Editing %action%'),
@@ -31,3 +41,8 @@
3141
{{ form_end(form) }}
3242
</div>
3343
{% endblock %}
44+
45+
{% block javascripts %}
46+
{{ parent() }}
47+
{{ encore_entry_script_tags('ibexa-admin-ui-user-settings-js', null, 'ibexa') }}
48+
{% endblock %}

src/lib/Menu/UserSetting/UserSettingUpdateRightSidebarBuilder.php

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ public function createStructure(array $options): ItemInterface
6161
{
6262
/** @var \Knp\Menu\ItemInterface|\Knp\Menu\ItemInterface[] $menu */
6363
$menu = $this->factory->createItem('root');
64+
$route = $options['route'];
6465

6566
$saveItem = $this->createMenuItem(
6667
self::ITEM__SAVE,
@@ -69,7 +70,13 @@ public function createStructure(array $options): ItemInterface
6970
'class' => 'ibexa-btn--trigger',
7071
'data-click' => '#user_setting_update_update',
7172
],
72-
]
73+
'route' => $route ?? 'ibexa.user_settings.list',
74+
'routeParameters' => [
75+
'contentId' => $options['content_id'] ?? null,
76+
'versionNo' => $options['version_no'] ?? null,
77+
'language' => $options['language'] ?? null,
78+
],
79+
],
7380
);
7481

7582
$saveItem->addChild(
@@ -90,7 +97,12 @@ public function createStructure(array $options): ItemInterface
9097
self::ITEM__CANCEL => $this->createMenuItem(
9198
self::ITEM__CANCEL,
9299
[
93-
'route' => 'ibexa.user_settings.list',
100+
'route' => $route ?? 'ibexa.user_settings.list',
101+
'routeParameters' => [
102+
'contentId' => $options['content_id'] ?? null,
103+
'versionNo' => $options['version_no'] ?? null,
104+
'language' => $options['language'] ?? null,
105+
],
94106
]
95107
),
96108
]);

0 commit comments

Comments
 (0)