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

bug #3383572 [interface] Cannot execute saved query

Browse Source 
When the Go button related to the "Run SQL query" section is pressed,
avoid transmitting the value of id_bookmark from the "Bookmarked SQL
query" section; otherwise import.php would think that it needs to
do a bookmark action instead of executing the query.
This commit is contained in:
Marc Delisle
2011-09-18 08:11:15 -04:00
parent 5511ae8fbc
commit 6ac29b4791
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -8,6 +8,7 @@ phpMyAdmin - ChangeLog
- bug #3399951 [export] Config for export compression not used - bug #3399951 [export] Config for export compression not used
- bug #3400690 [privileges] DB-specific privileges won't submit - bug #3400690 [privileges] DB-specific privileges won't submit
- bug #3410604 [config] Configuration storage incorrect suggested table name - bug #3410604 [config] Configuration storage incorrect suggested table name
- bug #3383572 [interface] Cannot execute saved query
3.4.5.0 (2011-09-14) 3.4.5.0 (2011-09-14)
- bug #3375325 [interface] Page list in navigation frame looks odd - bug #3375325 [interface] Page list in navigation frame looks odd

12
js/sql.js
View File

@@ -261,10 +261,16 @@ $(document).ready(function() {
* @memberOf jQuery * @memberOf jQuery
* @name sqlqueryform_submit * @name sqlqueryform_submit
*/ */
$("#sqlqueryform.ajax").live('submit', function(event) { $("#sqlqueryform.ajax input:submit").live('click', function(event) {
event.preventDefault(); event.preventDefault();
$form = $(this); var $form = $(this).closest("form");
var clicked_button = $(this).attr('id');
if ('button_submit_query' == clicked_button) {
$form.find("select[name=id_bookmark]").attr("value","");
}
if (! checkSqlQuery($form[0])) { if (! checkSqlQuery($form[0])) {
return false; return false;
} }
@@ -276,7 +282,7 @@ $(document).ready(function() {
PMA_prepareForAjaxRequest($form); PMA_prepareForAjaxRequest($form);
$.post($(this).attr('action'), $(this).serialize() , function(data) { $.post($form.attr('action'), $form.serialize() , function(data) {
if(data.success == true) { if(data.success == true) {
// fade out previous messages, if any // fade out previous messages, if any
$('.success').fadeOut(); $('.success').fadeOut();

4
libraries/sql_query_form.lib.php
View File

@@ -381,7 +381,7 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter
.'</label>' . "\n"; .'</label>' . "\n";
echo '</div>' . "\n"; echo '</div>' . "\n";
echo '<input type="submit" name="SQL" tabindex="200" value="' . __('Go') . '" />' echo '<input type="submit" id="button_submit_query" name="SQL" tabindex="200" value="' . __('Go') . '" />'
."\n"; ."\n";
echo '<div class="clearfloat"></div>' . "\n"; echo '<div class="clearfloat"></div>' . "\n";
echo '</fieldset>' . "\n"; echo '</fieldset>' . "\n";
@@ -451,7 +451,7 @@ function PMA_sqlQueryFormBookmark()
echo '</fieldset>' . "\n"; echo '</fieldset>' . "\n";
echo '<fieldset id="bookmarkoptionsfooter" class="tblFooters">' . "\n"; echo '<fieldset id="bookmarkoptionsfooter" class="tblFooters">' . "\n";
echo '<input type="submit" name="SQL" value="' . __('Go') . '" />'; echo '<input type="submit" name="SQL" id="button_submit_bookmark" value="' . __('Go') . '" />';
echo '<div class="clearfloat"></div>' . "\n"; echo '<div class="clearfloat"></div>' . "\n";
echo '</fieldset>' . "\n"; echo '</fieldset>' . "\n";
} }