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.

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

Disable Ajax for some links #19113

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 0 additions & 13 deletions resources/js/src/server/databases.ts
Original file line number Diff line number Diff line change
Expand Up @@ -134,18 +134,6 @@ const CreateDatabase = {
}
};

function checkPrivilegesForDatabase () {
var tableRows = $('.server_databases');
$.each(tableRows, function () {
$(this).on('click', function () {
const db = $(this).attr('data');
if (db !== CommonParams.get('db')) {
Navigation.update(CommonParams.setAll({ 'db': db, 'table': '' }));
}
});
});
}

AJAX.registerTeardown('server/databases.js', function () {
$(document).off('submit', '#dbStatsForm');
$(document).off('submit', '#create_database_form.ajax');
Expand All @@ -154,5 +142,4 @@ AJAX.registerTeardown('server/databases.js', function () {
AJAX.registerOnload('server/databases.js', function () {
$(document).on('submit', '#dbStatsForm', DropDatabases.handleEvent);
$(document).on('submit', '#create_database_form.ajax', CreateDatabase.handleEvent);
checkPrivilegesForDatabase();
});
14 changes: 7 additions & 7 deletions resources/templates/database/structure/structure_table_row.twig
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
id="checkbox_tbl_{{ curr }}">
</td>
<th>
<a href="{{ url('/sql', table_url_params|merge({'pos': 0})) }}" title="{{ browse_table_label_title }}">
<a class="disableAjax" href="{{ url('/sql', table_url_params|merge({'pos': 0})) }}" title="{{ browse_table_label_title }}">
{{- browse_table_label_truename -}}
</a>
{{ tracking_icon|raw }}
Expand Down Expand Up @@ -39,24 +39,24 @@
{% endif %}

<td class="text-center d-print-none">
<a href="{{ url('/sql', table_url_params|merge({'pos': 0})) }}">
<a class="disableAjax" href="{{ url('/sql', table_url_params|merge({'pos': 0})) }}">
{{ may_have_rows ? get_icon('b_browse', 'Browse'|trans) : get_icon('bd_browse', 'Browse'|trans) }}
</a>
</td>
<td class="text-center d-print-none">
<a href="{{ url('/table/structure', table_url_params) }}">
<a class="disableAjax" href="{{ url('/table/structure', table_url_params) }}">
{{ get_icon('b_props', 'Structure'|trans) }}
</a>
</td>
<td class="text-center d-print-none">
<a href="{{ url('/table/search', table_url_params) }}">
<a class="disableAjax" href="{{ url('/table/search', table_url_params) }}">
{{ may_have_rows ? get_icon('b_select', 'Search'|trans) : get_icon('bd_select', 'Search'|trans) }}
</a>
</td>

{% if not db_is_system_schema %}
<td class="insert_table text-center d-print-none">
<a href="{{ url('/table/change', table_url_params) }}">{{ get_icon('b_insrow', 'Insert'|trans) }}</a>
<td class="text-center d-print-none">
<a class="disableAjax" href="{{ url('/table/change', table_url_params) }}">{{ get_icon('b_insrow', 'Insert'|trans) }}</a>
</td>
{% if table_is_view %}
<td class="text-center d-print-none">
Expand Down Expand Up @@ -131,7 +131,7 @@

{% if is_show_stats %}
<td class="value tbl_size font-monospace text-end">
<a href="{{ url('/table/structure', table_url_params) }}#showusage">
<a class="disableAjax" href="{{ url('/table/structure', table_url_params) }}#showusage">
<span>{{ formatted_size }}</span>&nbsp;<span class="unit">{{ unit }}</span>
</a>
</td>
Expand Down
5 changes: 2 additions & 3 deletions resources/templates/server/databases/index.twig
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
{% endif %}

<td class="name">
<a href="{{ database.url }}" title="
<a class="disableAjax" href="{{ database.url }}" title="
{{- "Jump to database '%s'"|trans|format(database.name) }}">
{{ database.name }}
</a>
Expand Down Expand Up @@ -234,8 +234,7 @@
{% endif %}

<td class="tool">
<a class="server_databases" data="
{{- database.name }}" href="{{ url('/database/privileges', {'db': database.name}) }}" title="
<a class="disableAjax" href="{{ url('/database/privileges', {'db': database.name}) }}" title="
{{- 'Check privileges for database "%s".'|trans|format(database.name) }}">
{{ get_icon('s_rights', 'Check privileges'|trans) }}
</a>
Expand Down
Loading