gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #16181 from mauriciofauth/button-formaction

Browse Source 
Use button formaction attribute for table structure bulk links
This commit is contained in:
Maurício Meneghini Fauth 2020-06-09 15:41:52 -03:00 committed by GitHub
commit a4644916f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
js/table/structure.js
View File

@ -51,7 +51,7 @@ AJAX.registerTeardown('table/structure.js', function () {
$(document).off('click', '#move_columns_anchor');
$(document).off('click', '#printView');
$(document).off('submit', '.append_fields_form.ajax');
$('body').off('click', '#fieldsForm.ajax button[name="submit_mult"], #fieldsForm.ajax input[name="submit_mult"]');
$('body').off('click', '#fieldsForm.ajax button');
$(document).off('click', 'a[name^=partition_action].ajax');
$(document).off('click', '#remove_partitioning.ajax');
});
@ -409,40 +409,16 @@ AJAX.registerOnload('table/structure.js', function () {
/**
* Handles multi submits in table structure page such as change, browse, drop, primary etc.
*/
$('body').on('click', '#fieldsForm.ajax button[name="submit_mult"], #fieldsForm.ajax input[name="submit_mult"]', function (e) {
$('body').on('click', '#fieldsForm.ajax button', function (e) {
e.preventDefault();
var $button = $(this);
var action = $button.val();
var $form = $button.parents('form');
var $form = $(this).parents('form');
var argsep = CommonParams.get('arg_separator');
var submitData = $form.serialize() + argsep + 'ajax_request=true' + argsep + 'ajax_page_request=true' + argsep + 'submit_mult=' + action;
var submitData = $form.serialize() + argsep + 'ajax_request=true' + argsep + 'ajax_page_request=true';
Functions.ajaxShowMessage();
AJAX.source = $form;
var url = $form.attr('action');
if (action === 'browse') {
url = 'index.php?route=/table/structure/browse';
} else if (action === 'add_to_central_columns') {
url = 'index.php?route=/table/structure/central-columns-add';
} else if (action === 'remove_from_central_columns') {
url = 'index.php?route=/table/structure/central-columns-remove';
} else if (action === 'change') {
url = 'index.php?route=/table/structure/change';
} else if (action === 'drop') {
url = 'index.php?route=/table/structure/drop-confirm';
} else if (action === 'ftext') {
url = 'index.php?route=/table/structure/fulltext';
} else if (action === 'index') {
url = 'index.php?route=/table/structure/index';
} else if (action === 'primary') {
url = 'index.php?route=/table/structure/primary';
} else if (action === 'spatial') {
url = 'index.php?route=/table/structure/spatial';
} else if (action === 'unique') {
url = 'index.php?route=/table/structure/unique';
}
$.post(url, submitData, AJAX.responseHandler);
$.post(this.formAction, submitData, AJAX.responseHandler);
});
/**

112
templates/table/structure/display_structure.twig
View File

@ -277,90 +277,44 @@
'form_name': 'fieldsForm'
} only %}
{{ get_button_or_image(
'submit_mult',
'mult_submit',
'Browse'|trans,
'b_browse',
'browse'
) }}
<button class="btn btn-link mult_submit" type="submit" formaction="{{ url('/table/structure/browse') }}">
{{ get_icon('b_browse', 'Browse'|trans) }}
</button>
{% if not tbl_is_view and not db_is_system_schema %}
{{ get_button_or_image(
'submit_mult',
'mult_submit change_columns_anchor ajax',
'Change'|trans,
'b_edit',
'change'
) }}
{{ get_button_or_image(
'submit_mult',
'mult_submit',
'Drop'|trans,
'b_drop',
'drop'
) }}
<button class="btn btn-link mult_submit" type="submit" formaction="{{ url('/table/structure/change') }}">
{{ get_icon('b_edit', 'Change'|trans) }}
</button>
<button class="btn btn-link mult_submit" type="submit" formaction="{{ url('/table/structure/drop-confirm') }}">
{{ get_icon('b_drop', 'Drop'|trans) }}
</button>
{% if tbl_storage_engine != 'ARCHIVE' %}
{{ get_button_or_image(
'submit_mult',
'mult_submit',
'Primary'|trans,
'b_primary',
'primary'
) }}
{{ get_button_or_image(
'submit_mult',
'mult_submit',
'Unique'|trans,
'b_unique',
'unique'
) }}
{{ get_button_or_image(
'submit_mult',
'mult_submit',
'Index'|trans,
'b_index',
'index'
) }}
{{ get_button_or_image(
'submit_mult',
'mult_submit',
'Fulltext'|trans,
'b_ftext',
'ftext'
) }}
{% if tbl_storage_engine != 'ARCHIVE' %}
<button class="btn btn-link mult_submit" type="submit" formaction="{{ url('/table/structure/primary') }}">
{{ get_icon('b_primary', 'Primary'|trans) }}
</button>
<button class="btn btn-link mult_submit" type="submit" formaction="{{ url('/table/structure/unique') }}">
{{ get_icon('b_unique', 'Unique'|trans) }}
</button>
<button class="btn btn-link mult_submit" type="submit" formaction="{{ url('/table/structure/index') }}">
{{ get_icon('b_index', 'Index'|trans) }}
</button>
<button class="btn btn-link mult_submit" type="submit" formaction="{{ url('/table/structure/spatial') }}">
{{ get_icon('b_spatial', 'Spatial'|trans) }}
</button>
<button class="btn btn-link mult_submit" type="submit" formaction="{{ url('/table/structure/fulltext') }}">
{{ get_icon('b_ftext', 'Fulltext'|trans) }}
</button>
{% if tbl_storage_engine is not empty and (
tbl_storage_engine == 'MYISAM'
or tbl_storage_engine == 'ARIA'
or tbl_storage_engine == 'MARIA') %}
{{ get_button_or_image(
'submit_mult',
'mult_submit',
'Fulltext'|trans,
'b_ftext',
'ftext'
) }}
{% endif %}
{% if central_columns_work %}
{{ get_button_or_image(
'submit_mult',
'mult_submit',
'Add to central columns'|trans,
'centralColumns_add',
'add_to_central_columns'
) }}
{{ get_button_or_image(
'submit_mult',
'mult_submit',
'Remove from central columns'|trans,
'centralColumns_delete',
'remove_from_central_columns'
) }}
{% endif %}
{% if central_columns_work %}
<button class="btn btn-link mult_submit" type="submit" formaction="{{ url('/table/structure/central-columns-add') }}">
{{ get_icon('centralColumns_add', 'Add to central columns'|trans) }}
</button>
<button class="btn btn-link mult_submit" type="submit" formaction="{{ url('/table/structure/central-columns-remove') }}">
{{ get_icon('centralColumns_delete', 'Remove from central columns'|trans) }}
</button>
{% endif %}
{% endif %}
{% endif %}
</div>
</form>