patch #3303195 [interface] Checkbox to have SQL input remain

This commit is contained in:
Gareth Pursehouse 2012-01-07 07:00:56 -05:00 committed by Marc Delisle
parent 8d5434fa98
commit 73edcc1511
4 changed files with 19 additions and 2 deletions

View File

@ -67,6 +67,7 @@ phpMyAdmin - ChangeLog
- bug #3461750 [edit] Sort by key generates wrong sql with limit clause
- bug #3340842 [structure] Error dropping index of non-existing column
- bug #3093145 [display] Page through rows returned from a view
+ patch #3303195 [interface] Checkbox to have SQL input remain
3.4.10.0 (not yet released)
- bug #3460090 [interface] TextareaAutoSelect feature broken

View File

@ -224,8 +224,10 @@ $(document).ready(function() {
.html(data)
.trigger('makegrid');
$('#togglequerybox').show();
if ($("#togglequerybox").siblings(":visible").length > 0) {
$("#togglequerybox").trigger('click');
if( $('#sqlqueryform input[name="retain_query_editor"]').is(':checked') != true ) {
if ($("#togglequerybox").siblings(":visible").length > 0) {
$("#togglequerybox").trigger('click');
}
}
PMA_init_slider();
}

View File

@ -638,6 +638,13 @@ $cfg['SkipLockedTables'] = false;
*/
$cfg['ShowSQL'] = true;
/**
* retain SQL input on Ajax execute
*
* @global boolean $cfg['RetainQueryEditor']
*/
$cfg['RetainQueryEditor'] = false;
/**
* show a 'Drop database' link to normal users
*

View File

@ -344,6 +344,13 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter
.'<label for="checkbox_show_query">' . __('Show this query here again')
.'</label>' . "\n";
echo '<input type="checkbox" name="retain_query_editor" value="1" '
. 'id="retain_query_editor" tabindex="133" '
. (empty( $cfg['RetainQueryEditor'] ) ? '' : ' checked="checked"')
. ' />'
. '<label for="retain_query_editor">' . __('Retain query editor')
. '</label>';
echo '</div>' . "\n";
echo '<input type="submit" id="button_submit_query" name="SQL" tabindex="200" value="' . __('Go') . '" />'
."\n";