Skip to content

Commit 54941a2

Browse files
MauricioFauthMauricioFauth
authored
Merge pull request #18136 from MauricioFauth/top-menu-full-reload
Force a full page reload for top menu links
2 parents d9430f7 + 36a77f7 commit 54941a2

14 files changed

Lines changed: 33 additions & 46 deletions

File tree

‎templates/database/multi_table_query/form.twig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<ul class="nav nav-pills m-2">
22
<li class="nav-item">
3-
<a class="nav-link active" href="{{ url('/database/multi-table-query', {'db': db}) }}">
3+
<a class="nav-link active disableAjax" href="{{ url('/database/multi-table-query', {'db': db}) }}">
44
{% trans 'Multi-table query' %}
55
</a>
66
</li>
77

88
<li class="nav-item">
9-
<a class="nav-link" href="{{ url('/database/qbe', {'db': db}) }}">
9+
<a class="nav-link disableAjax" href="{{ url('/database/qbe', {'db': db}) }}">
1010
{% trans 'Query by example' %}
1111
</a>
1212
</li>

‎templates/database/qbe/index.twig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<ul class="nav nav-pills m-2">
22
<li class="nav-item">
3-
<a class="nav-link" href="{{ url('/database/multi-table-query', url_params) }}">
3+
<a class="nav-link disableAjax" href="{{ url('/database/multi-table-query', url_params) }}">
44
{% trans 'Multi-table query' %}
55
</a>
66
</li>
77

88
<li class="nav-item">
9-
<a class="nav-link active" href="{{ url('/database/qbe', url_params) }}">
9+
<a class="nav-link active disableAjax" href="{{ url('/database/qbe', url_params) }}">
1010
{% trans 'Query by example' %}
1111
</a>
1212
</li>

‎templates/preferences/header.twig‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,49 +2,49 @@
22
<div class="row">
33
<ul id="user_prefs_tabs" class="nav nav-pills m-2">
44
<li class="nav-item my-1">
5-
<a href="{{ url('/preferences/manage') }}" class="nav-link{{ route == '/preferences/manage' ? ' active' }}">
5+
<a href="{{ url('/preferences/manage') }}" class="nav-link{{ route == '/preferences/manage' ? ' active' }} disableAjax">
66
{% trans 'Manage your settings' %}
77
</a>
88
</li>
99

1010
<li class="nav-item my-1">
11-
<a href="{{ url('/preferences/two-factor') }}" class="nav-link{{ route == '/preferences/two-factor' ? ' active' }}">
11+
<a href="{{ url('/preferences/two-factor') }}" class="nav-link{{ route == '/preferences/two-factor' ? ' active' }} disableAjax">
1212
{% trans 'Two-factor authentication' %}
1313
</a>
1414
</li>
1515

1616
<li class="nav-item my-1">
17-
<a href="{{ url('/preferences/features') }}" class="nav-link{{ route == '/preferences/features' ? ' active' }}">
17+
<a href="{{ url('/preferences/features') }}" class="nav-link{{ route == '/preferences/features' ? ' active' }} disableAjax">
1818
{{ get_icon('b_tblops', 'Features'|trans, false, false, 'TabsMode') }}
1919
</a>
2020
</li>
2121

2222
<li class="nav-item my-1">
23-
<a href="{{ url('/preferences/sql') }}" class="nav-link{{ route == '/preferences/sql' ? ' active' }}">
23+
<a href="{{ url('/preferences/sql') }}" class="nav-link{{ route == '/preferences/sql' ? ' active' }} disableAjax">
2424
{{ get_icon('b_sql', 'SQL queries'|trans, false, false, 'TabsMode') }}
2525
</a>
2626
</li>
2727

2828
<li class="nav-item my-1">
29-
<a href="{{ url('/preferences/navigation') }}" class="nav-link{{ route == '/preferences/navigation' ? ' active' }}">
29+
<a href="{{ url('/preferences/navigation') }}" class="nav-link{{ route == '/preferences/navigation' ? ' active' }} disableAjax">
3030
{{ get_icon('b_select', 'Navigation panel'|trans, false, false, 'TabsMode') }}
3131
</a>
3232
</li>
3333

3434
<li class="nav-item my-1">
35-
<a href="{{ url('/preferences/main-panel') }}" class="nav-link{{ route == '/preferences/main-panel' ? ' active' }}">
35+
<a href="{{ url('/preferences/main-panel') }}" class="nav-link{{ route == '/preferences/main-panel' ? ' active' }} disableAjax">
3636
{{ get_icon('b_props', 'Main panel'|trans, false, false, 'TabsMode') }}
3737
</a>
3838
</li>
3939

4040
<li class="nav-item my-1">
41-
<a href="{{ url('/preferences/export') }}" class="nav-link{{ route == '/preferences/export' ? ' active' }}">
41+
<a href="{{ url('/preferences/export') }}" class="nav-link{{ route == '/preferences/export' ? ' active' }} disableAjax">
4242
{{ get_icon('b_export', 'Export'|trans, false, false, 'TabsMode') }}
4343
</a>
4444
</li>
4545

4646
<li class="nav-item my-1">
47-
<a href="{{ url('/preferences/import') }}" class="nav-link{{ route == '/preferences/import' ? ' active' }}">
47+
<a href="{{ url('/preferences/import') }}" class="nav-link{{ route == '/preferences/import' ? ' active' }} disableAjax">
4848
{{ get_icon('b_import', 'Import'|trans, false, false, 'TabsMode') }}
4949
</a>
5050
</li>

‎templates/server/privileges/subnav.twig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<div class="row">
22
<ul class="nav nav-pills m-2">
33
<li class="nav-item">
4-
<a class="nav-link{{ active == 'privileges' ? ' active' }}" href="{{ url('/server/privileges') }}">
4+
<a class="nav-link{{ active == 'privileges' ? ' active' }} disableAjax" href="{{ url('/server/privileges') }}">
55
{% trans 'User accounts overview' %}
66
</a>
77
</li>
88
{% if is_super_user %}
99
<li class="nav-item">
10-
<a class="nav-link{{ active == 'user-groups' ? ' active' }}" href="{{ url('/server/user-groups') }}">
10+
<a class="nav-link{{ active == 'user-groups' ? ' active' }} disableAjax" href="{{ url('/server/user-groups') }}">
1111
{% trans 'User groups' %}
1212
</a>
1313
</li>

‎templates/server/status/base.twig‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,32 @@
22
<div class="row">
33
<ul class="nav nav-pills m-2">
44
<li class="nav-item">
5-
<a href="{{ url('/server/status') }}" class="nav-link{{ active == 'status' ? ' active' }}">
5+
<a href="{{ url('/server/status') }}" class="nav-link{{ active == 'status' ? ' active' }} disableAjax">
66
{% trans 'Server' %}
77
</a>
88
</li>
99
<li class="nav-item">
10-
<a href="{{ url('/server/status/processes') }}" class="nav-link{{ active == 'processes' ? ' active' }}">
10+
<a href="{{ url('/server/status/processes') }}" class="nav-link{{ active == 'processes' ? ' active' }} disableAjax">
1111
{% trans 'Processes' %}
1212
</a>
1313
</li>
1414
<li class="nav-item">
15-
<a href="{{ url('/server/status/queries') }}" class="nav-link{{ active == 'queries' ? ' active' }}">
15+
<a href="{{ url('/server/status/queries') }}" class="nav-link{{ active == 'queries' ? ' active' }} disableAjax">
1616
{% trans 'Query statistics' %}
1717
</a>
1818
</li>
1919
<li class="nav-item">
20-
<a href="{{ url('/server/status/variables') }}" class="nav-link{{ active == 'variables' ? ' active' }}">
20+
<a href="{{ url('/server/status/variables') }}" class="nav-link{{ active == 'variables' ? ' active' }} disableAjax">
2121
{% trans 'All status variables' %}
2222
</a>
2323
</li>
2424
<li class="nav-item">
25-
<a href="{{ url('/server/status/monitor') }}" class="nav-link{{ active == 'monitor' ? ' active' }}">
25+
<a href="{{ url('/server/status/monitor') }}" class="nav-link{{ active == 'monitor' ? ' active' }} disableAjax">
2626
{% trans 'Monitor' %}
2727
</a>
2828
</li>
2929
<li class="nav-item">
30-
<a href="{{ url('/server/status/advisor') }}" class="nav-link{{ active == 'advisor' ? ' active' }}">
30+
<a href="{{ url('/server/status/advisor') }}" class="nav-link{{ active == 'advisor' ? ' active' }} disableAjax">
3131
{% trans 'Advisor' %}
3232
</a>
3333
</li>

‎templates/table/find_replace/index.twig‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<ul class="nav nav-pills m-2">
22
<li class="nav-item">
3-
<a class="nav-link" href="{{ url('/table/search', {'db': db, 'table': table, 'pos': 0}) }}">
3+
<a class="nav-link disableAjax" href="{{ url('/table/search', {'db': db, 'table': table, 'pos': 0}) }}">
44
{{ get_icon('b_search', 'Table search'|trans, false, false, 'TabsMode') }}
55
</a>
66
</li>
77

88
<li class="nav-item">
9-
<a class="nav-link" href="{{ url('/table/zoom-search', {'db': db, 'table': table}) }}">
9+
<a class="nav-link disableAjax" href="{{ url('/table/zoom-search', {'db': db, 'table': table}) }}">
1010
{{ get_icon('b_select', 'Zoom search'|trans, false, false, 'TabsMode') }}
1111
</a>
1212
</li>
1313

1414
<li class="nav-item">
15-
<a class="nav-link active" href="{{ url('/table/find-replace', {'db': db, 'table': table}) }}">
15+
<a class="nav-link active disableAjax" href="{{ url('/table/find-replace', {'db': db, 'table': table}) }}">
1616
{{ get_icon('b_find_replace', 'Find and replace'|trans, false, false, 'TabsMode') }}
1717
</a>
1818
</li>

‎templates/table/page_with_secondary_tabs.twig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{% if relation_parameters.relationFeature is not null or is_foreign_key_supported %}
22
<ul class="nav nav-pills m-2 d-print-none">
33
<li class="nav-item">
4-
<a href="{{ url('/table/structure', {'db': db, 'table': table}) }}" id="table_structure_id" class="nav-link{{ route == '/table/structure' ? ' active' }}">
4+
<a href="{{ url('/table/structure', {'db': db, 'table': table}) }}" id="table_structure_id" class="nav-link{{ route == '/table/structure' ? ' active' }} disableAjax">
55
{{ get_icon('b_props', 'Table structure'|trans, true) }}
66
</a>
77
</li>
88

99
<li class="nav-item">
10-
<a href="{{ url('/table/relation', {'db': db, 'table': table}) }}" id="table_relation_id" class="nav-link{{ route == '/table/relation' ? ' active' }}">
10+
<a href="{{ url('/table/relation', {'db': db, 'table': table}) }}" id="table_relation_id" class="nav-link{{ route == '/table/relation' ? ' active' }} disableAjax">
1111
{{ get_icon('b_relations', 'Relation view'|trans, true) }}
1212
</a>
1313
</li>

‎templates/table/search/index.twig‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<ul class="nav nav-pills m-2">
22
<li class="nav-item">
3-
<a class="nav-link active" href="{{ url('/table/search', {'db': db, 'table': table, 'pos': 0}) }}">
3+
<a class="nav-link active disableAjax" href="{{ url('/table/search', {'db': db, 'table': table, 'pos': 0}) }}">
44
{{ get_icon('b_search', 'Table search'|trans, false, false, 'TabsMode') }}
55
</a>
66
</li>
77

88
<li class="nav-item">
9-
<a class="nav-link" href="{{ url('/table/zoom-search', {'db': db, 'table': table}) }}">
9+
<a class="nav-link disableAjax" href="{{ url('/table/zoom-search', {'db': db, 'table': table}) }}">
1010
{{ get_icon('b_select', 'Zoom search'|trans, false, false, 'TabsMode') }}
1111
</a>
1212
</li>
1313

1414
<li class="nav-item">
15-
<a class="nav-link" href="{{ url('/table/find-replace', {'db': db, 'table': table}) }}">
15+
<a class="nav-link disableAjax" href="{{ url('/table/find-replace', {'db': db, 'table': table}) }}">
1616
{{ get_icon('b_find_replace', 'Find and replace'|trans, false, false, 'TabsMode') }}
1717
</a>
1818
</li>

‎templates/table/zoom_search/index.twig‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<ul class="nav nav-pills m-2">
22
<li class="nav-item">
3-
<a class="nav-link" href="{{ url('/table/search', {'db': db, 'table': table, 'pos': 0}) }}">
3+
<a class="nav-link disableAjax" href="{{ url('/table/search', {'db': db, 'table': table, 'pos': 0}) }}">
44
{{ get_icon('b_search', 'Table search'|trans, false, false, 'TabsMode') }}
55
</a>
66
</li>
77

88
<li class="nav-item">
9-
<a class="nav-link active" href="{{ url('/table/zoom-search', {'db': db, 'table': table}) }}">
9+
<a class="nav-link active disableAjax" href="{{ url('/table/zoom-search', {'db': db, 'table': table}) }}">
1010
{{ get_icon('b_select', 'Zoom search'|trans, false, false, 'TabsMode') }}
1111
</a>
1212
</li>
1313

1414
<li class="nav-item">
15-
<a class="nav-link" href="{{ url('/table/find-replace', {'db': db, 'table': table}) }}">
15+
<a class="nav-link disableAjax" href="{{ url('/table/find-replace', {'db': db, 'table': table}) }}">
1616
{{ get_icon('b_find_replace', 'Find and replace'|trans, false, false, 'TabsMode') }}
1717
</a>
1818
</li>

‎templates/top_menu.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<ul id="topmenu" class="navbar-nav">
99
{% for tab in tabs %}
1010
<li class="nav-item{{ tab.active ? ' active' }}">
11-
<a class="nav-link text-nowrap" href="{{ url(tab.route, url_params|merge(tab.args ?? [])) }}">
11+
<a class="nav-link text-nowrap disableAjax" href="{{ url(tab.route, url_params|merge(tab.args ?? [])) }}">
1212
{{ get_icon(tab.icon, tab.text, false, true, 'TabsMode') }}
1313
{% if tab.active %}
1414
<span class="visually-hidden">{% trans %}(current){% notes %}Current page{% endtrans %}</span>

0 commit comments

Comments
 (0)