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

Add rfe #1422 [interface] Provide feedback if no columns selected for multi-submit

Browse Source
This commit is contained in:
J.M 2013-04-28 15:17:45 +02:00
parent 09321ecb8d
commit 14eb3c32ca
4 changed files with 43 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -7,6 +7,7 @@ phpMyAdmin - ChangeLog
- bug #3890 [import] Web server upload directory import fails
- bug #3891 [import] Server upload folder import file name missing in success message
+ rfe #1421 [auth] Add retry button on connection failure with config auth
+ rfe #1422 [interface] Provide feedback if no columns selected for multi-submit
4.0.0.0 (not yet released)
+ Patch #3481047 for rfe #3480477 Insert as new row enhancement

34
js/tbl_structure.js
View File

@ -79,26 +79,6 @@ AJAX.registerOnload('tbl_structure.js', function() {
}
}); // end change table button "do_save_data"
/**
* Attach Event Handler for 'Change Column'
*/
$("a.change_column_anchor.ajax").live('click', function(event) {
event.preventDefault();
var $msg = PMA_ajaxShowMessage();
$('#page_content').hide();
$.get($(this).attr('href'), {'ajax_request': true}, function(data) {
PMA_ajaxRemoveMessage($msg);
if (data.success) {
$('<div id="change_column_dialog"></div>')
.html(data.message)
.insertBefore('#page_content');
PMA_verifyColumnsProperties();
} else {
PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error, false);
}
});
});
/**
* Attach Event Handler for 'Change multiple columns'
*/
@ -111,12 +91,16 @@ AJAX.registerOnload('tbl_structure.js', function() {
$.post($form.prop("action"), params, function (data) {
PMA_ajaxRemoveMessage($msg);
if (data.success) {
$('<div id="change_column_dialog"></div>')
.html(data.message)
.insertBefore('#page_content');
PMA_verifyColumnsProperties();
$('#page_content')
.empty()
.append(
$('<div id="change_column_dialog"></div>')
.html(data.message)
)
.show();
} else {
PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error, false);
$('#page_content').show();
PMA_ajaxShowMessage(data.error);
}
});
});

2
libraries/structure.lib.php
View File

@ -1311,7 +1311,7 @@ function PMA_getHtmlForDropColumn($tbl_is_view, $db_is_information_schema,
if (! $tbl_is_view && ! $db_is_information_schema) {
$html_output .= '<td class="edit center">'
. '<a class="change_column_anchor ajax"'
. '<a class="change_column_anchor"'
. ' href="tbl_structure.php?'
. $url_query . '&amp;field=' . $field_encoded
. '&amp;change_column=1">'

59
tbl_structure.php
View File

@ -87,37 +87,42 @@ if (isset($_REQUEST['submit_mult_change_x'])) {
$_REQUEST['selected_fld'] = $_REQUEST['selected'];
}
}
if (! empty($submit_mult)) {
if (isset($_REQUEST['selected_fld'])) {
$err_url = 'tbl_structure.php?' . PMA_generate_common_url($db, $table);
if ($submit_mult == 'browse') {
// browsing the table displaying only selected fields/columns
$GLOBALS['active_page'] = 'sql.php';
$sql_query = '';
foreach ($_REQUEST['selected_fld'] as $idx => $sval) {
if ($sql_query == '') {
$sql_query .= 'SELECT ' . PMA_Util::backquote($sval);
} else {
$sql_query .= ', ' . PMA_Util::backquote($sval);
}
}
$sql_query .= ' FROM ' . PMA_Util::backquote($db)
. '.' . PMA_Util::backquote($table);
include 'sql.php';
exit;
} else {
// handle multiple field commands
// handle confirmation of deleting multiple fields/columns
$action = 'tbl_structure.php';
include 'libraries/mult_submits.inc.php';
/**
* if $submit_mult == 'change', execution will have stopped
* at this point
*/
if (! empty($submit_mult) && isset($_REQUEST['selected_fld'])) {
$err_url = 'tbl_structure.php?' . PMA_generate_common_url($db, $table);
if ($submit_mult == 'browse') {
// browsing the table displaying only selected fields/columns
$GLOBALS['active_page'] = 'sql.php';
$sql_query = '';
foreach ($_REQUEST['selected_fld'] as $idx => $sval) {
if ($sql_query == '') {
$sql_query .= 'SELECT ' . PMA_Util::backquote($sval);
} else {
$sql_query .= ', ' . PMA_Util::backquote($sval);
if (empty($message)) {
$message = PMA_Message::success();
}
}
$sql_query .= ' FROM ' . PMA_Util::backquote($db)
. '.' . PMA_Util::backquote($table);
include 'sql.php';
exit;
} else {
// handle multiple field commands
// handle confirmation of deleting multiple fields/columns
$action = 'tbl_structure.php';
include 'libraries/mult_submits.inc.php';
/**
* if $submit_mult == 'change', execution will have stopped
* at this point
*/
if (empty($message)) {
$message = PMA_Message::success();
}
$response = PMA_Response::getInstance();
$response->isSuccess(false);
$response->addJSON('message', __('No column selected.'));
}
}