- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5RC1-19187-g5e83631
by Marc Delisle 18 Sep '11

18 Sep '11

The branch, master has been updated via 5e83631469f286abb77c95adf5284923a3a0873a (commit) via 6ac29b4791f8c31dd057d4ed981f26599a2cf4a3 (commit) from 8373e5feec2232e6a17b342eb0bf74930431bfcc (commit) - Log ----------------------------------------------------------------- commit 5e83631469f286abb77c95adf5284923a3a0873a Merge: 8373e5f 6ac29b4 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Sep 18 08:26:47 2011 -0400 Fix merge conflicts ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/sql.js | 10 ++++++++-- libraries/sql_query_form.lib.php | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index b0d3206..e8986d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -56,6 +56,7 @@ phpMyAdmin - ChangeLog - bug #3399951 [export] Config for export compression not used - bug #3400690 [privileges] DB-specific privileges won't submit - bug #3410604 [config] Configuration storage incorrect suggested table name +- bug #3383572 [interface] Cannot execute saved query 3.4.5.0 (2011-09-14) - bug #3375325 [interface] Page list in navigation frame looks odd diff --git a/js/sql.js b/js/sql.js index 99fd93c..d6e3bf9 100644 --- a/js/sql.js +++ b/js/sql.js @@ -138,10 +138,16 @@ $(document).ready(function() { * @memberOf jQuery * @name sqlqueryform_submit */ - $("#sqlqueryform.ajax").live('submit', function(event) { + $("#sqlqueryform.ajax input:submit").live('click', function(event) { event.preventDefault(); - var $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])) { return false; } diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php index 3bdcf50..44b2321 100644 --- a/libraries/sql_query_form.lib.php +++ b/libraries/sql_query_form.lib.php @@ -345,7 +345,7 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter .'</label>' . "\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"; echo '<div class="clearfloat"></div>' . "\n"; echo '</fieldset>' . "\n"; @@ -408,7 +408,7 @@ function PMA_sqlQueryFormBookmark() echo '</fieldset>' . "\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 '</fieldset>' . "\n"; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_5RC1-13-g6ac29b4
by Marc Delisle 18 Sep '11

18 Sep '11

The branch, QA_3_4 has been updated via 6ac29b4791f8c31dd057d4ed981f26599a2cf4a3 (commit) from 5511ae8fbc577abb44206e35dd61a947dd60c814 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/sql.js | 12 +++++++++--- libraries/sql_query_form.lib.php | 4 ++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3287323..61cfbc4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ phpMyAdmin - ChangeLog - bug #3399951 [export] Config for export compression not used - bug #3400690 [privileges] DB-specific privileges won't submit - bug #3410604 [config] Configuration storage incorrect suggested table name +- bug #3383572 [interface] Cannot execute saved query 3.4.5.0 (2011-09-14) - bug #3375325 [interface] Page list in navigation frame looks odd diff --git a/js/sql.js b/js/sql.js index 842b6c6..34ab158 100644 --- a/js/sql.js +++ b/js/sql.js @@ -261,10 +261,16 @@ $(document).ready(function() { * @memberOf jQuery * @name sqlqueryform_submit */ - $("#sqlqueryform.ajax").live('submit', function(event) { + $("#sqlqueryform.ajax input:submit").live('click', function(event) { 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])) { return false; } @@ -276,7 +282,7 @@ $(document).ready(function() { PMA_prepareForAjaxRequest($form); - $.post($(this).attr('action'), $(this).serialize() , function(data) { + $.post($form.attr('action'), $form.serialize() , function(data) { if(data.success == true) { // fade out previous messages, if any $('.success').fadeOut(); diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php index 25f67cd..74cae9f 100644 --- a/libraries/sql_query_form.lib.php +++ b/libraries/sql_query_form.lib.php @@ -381,7 +381,7 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter .'</label>' . "\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"; echo '<div class="clearfloat"></div>' . "\n"; echo '</fieldset>' . "\n"; @@ -451,7 +451,7 @@ function PMA_sqlQueryFormBookmark() echo '</fieldset>' . "\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 '</fieldset>' . "\n"; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5RC1-19185-g8373e5f
by Madhura Jayaratne 18 Sep '11

18 Sep '11

The branch, master has been updated via 8373e5feec2232e6a17b342eb0bf74930431bfcc (commit) from 3e37bf159d2f065745d765ae009c5989fd6dc6bf (commit) - Log ----------------------------------------------------------------- commit 8373e5feec2232e6a17b342eb0bf74930431bfcc Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Sep 18 16:59:03 2011 +0530 Removed redundant function ----------------------------------------------------------------------- Summary of changes: libraries/tbl_select.lib.php | 25 ------------------------- tbl_select.php | 2 +- tbl_zoom_select.php | 2 +- 3 files changed, 2 insertions(+), 27 deletions(-) diff --git a/libraries/tbl_select.lib.php b/libraries/tbl_select.lib.php index 53ffcb7..2fa598b 100644 --- a/libraries/tbl_select.lib.php +++ b/libraries/tbl_select.lib.php @@ -9,31 +9,6 @@ require_once 'url_generating.lib.php'; /** - * Sets the title for foreign keys display link. - * - * @param mixed $propertiesIconic Type of icon property - * @param string $pmaThemeImage Icon Image - * - * @return string $str Value of the Title - */ -function PMA_tbl_setTitle($propertiesIconic, $pmaThemeImage) -{ - if ($propertiesIconic == true) { - $str = '<img class="icon" width="16" height="16" src="' . $pmaThemeImage - .'b_browse.png" alt="' . __('Browse foreign values') . '" title="' - . __('Browse foreign values') . '" />'; - - if ($propertiesIconic === 'both') { - $str .= __('Browse foreign values'); - } - - return $str; - } else { - return __('Browse foreign values'); - } -} - -/** * Gets all the fields of a table along with their types, collations * and whether null or not. * diff --git a/tbl_select.php b/tbl_select.php index 0ad5d25..6a2a5e4 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -25,7 +25,7 @@ $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js'; $GLOBALS['js_include'][] = 'jquery/timepicker.js'; $GLOBALS['js_include'][] = 'gis_data_editor.js'; -$titles['Browse'] = PMA_tbl_setTitle($GLOBALS['cfg']['PropertiesIconic'], $pmaThemeImage); +$titles['Browse'] = PMA_getIcon('b_browse.png', __('Browse')); $geom_types = PMA_getGISDatatypes(); /** diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php index 7fabd2f..7d803c6 100644 --- a/tbl_zoom_select.php +++ b/tbl_zoom_select.php @@ -55,7 +55,7 @@ if (isset($_REQUEST['get_data_row']) && $_REQUEST['get_data_row'] == true) { PMA_ajaxResponse(null, true, $extra_data); } -$titles['Browse'] = PMA_tbl_setTitle($GLOBALS['cfg']['PropertiesIconic'], $pmaThemeImage); +$titles['Browse'] = PMA_getIcon('b_browse.png', __('Browse')); /** * Not selection yet required -> displays the selection form */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5RC1-19184-g3e37bf1
by Madhura Jayaratne 18 Sep '11

18 Sep '11

The branch, master has been updated via 3e37bf159d2f065745d765ae009c5989fd6dc6bf (commit) via e71182b724bfb111085007b8a77b70ff02db623c (commit) via 5cd8af78c3fc587c6d1343bc47d938118f57051a (commit) from 20516dc7267fb84e586a6ee9f70db82b12f2e9a7 (commit) - Log ----------------------------------------------------------------- commit 3e37bf159d2f065745d765ae009c5989fd6dc6bf Merge: e71182b 20516dc Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Sep 18 16:40:52 2011 +0530 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit e71182b724bfb111085007b8a77b70ff02db623c Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Sep 18 16:36:30 2011 +0530 Convert bit values to printable form commit 5cd8af78c3fc587c6d1343bc47d938118f57051a Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Sep 18 15:43:18 2011 +0530 Simplify the logic a bit ----------------------------------------------------------------------- Summary of changes: js/tbl_zoom_plot.js | 30 ++++++++++++++++++++++-------- tbl_zoom_select.php | 8 ++++++++ 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/js/tbl_zoom_plot.js b/js/tbl_zoom_plot.js index 3f8d00b..665a534 100644 --- a/js/tbl_zoom_plot.js +++ b/js/tbl_zoom_plot.js @@ -388,16 +388,30 @@ $(document).ready(function() { if (key != 'where_clause') { sql_query += '`' + key + '`=' ; var value = newValues[key]; - if (sqlTypes[key] != null && value != null) { - if (sqlTypes[key] == 'bit' && value != '') { - sql_query += 'b\'' + value + '\', '; + + // null + if (value == null) { + sql_query += 'NULL, '; + + // empty + } else if ($.trim(value) == '') { + sql_query += "'', "; + + // other + } else { + // type explicitly identified + if (sqlTypes[key] != null) { + if (sqlTypes[key] == 'bit') { + sql_query += "b'" + value + "', "; + } + // type not explicitly identified } else { - sql_query += '\'\', '; + if (!isNumeric(value)) { + sql_query += "'" + value + "', "; + } else { + sql_query += value + ', '; + } } - } else if (!isNumeric(value) && value != null) { - sql_query += '\'' + value + '\', '; - } else { - sql_query += value + ', '; } } } diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php index 548b03f..7fabd2f 100644 --- a/tbl_zoom_select.php +++ b/tbl_zoom_select.php @@ -42,6 +42,14 @@ if (isset($_REQUEST['get_data_row']) && $_REQUEST['get_data_row'] == true) { $result = PMA_DBI_query($row_info_query . ";", null, PMA_DBI_QUERY_STORE); $fields_meta = PMA_DBI_get_fields_meta($result); while ($row = PMA_DBI_fetch_assoc($result)) { + // for bit fields we need to convert them to printable form + $i = 0; + foreach ($row as $col => $val) { + if ($fields_meta[$i]->type == 'bit') { + $row[$col] = PMA_printable_bit_value($val, $fields_meta[$i]->length); + } + $i++; + } $extra_data['row_info'] = $row; } PMA_ajaxResponse(null, true, $extra_data); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5RC1-19180-g4441512
by Marc Delisle 18 Sep '11

18 Sep '11

The branch, master has been updated via 4441512052218809a83dc5d9e790672feda5b0db (commit) from ef43e2fce8ff8aa5aaf455fd03fb27531ce60ccb (commit) - Log ----------------------------------------------------------------- commit 4441512052218809a83dc5d9e790672feda5b0db Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Sep 18 06:13:22 2011 -0400 Use newest message ----------------------------------------------------------------------- Summary of changes: libraries/sql_query_form.lib.php | 2 +- prefs_manage.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php index 78502c1..3bdcf50 100644 --- a/libraries/sql_query_form.lib.php +++ b/libraries/sql_query_form.lib.php @@ -433,7 +433,7 @@ function PMA_sqlQueryFormUpload() // start output echo '<fieldset id="">'; echo '<legend>'; - echo __('Location of the text file') . '</legend>'; + echo __('Browse your computer:') . '</legend>'; echo '<div class="formelement">'; echo '<input type="file" name="sql_file" class="textfield" /> '; echo PMA_displayMaximumUploadSize($GLOBALS['max_upload_size']); diff --git a/prefs_manage.php b/prefs_manage.php index 000cce4..7c5d3f8 100644 --- a/prefs_manage.php +++ b/prefs_manage.php @@ -236,7 +236,7 @@ PMA_printJsValue("PMA_messages['strSavedOn']", __('Saved on: @DATE@')); <input type="radio" id="import_text_file" name="import_type" value="text_file" checked="checked" /> <label for="import_text_file"><?php echo __('Import from file') ?></label> <div id="opts_import_text_file" class="prefsmanage_opts"> - <label for="input_import_file"><?php echo __('Location of the text file'); ?></label> + <label for="input_import_file"><?php echo __('Browse your computer:'); ?></label> <input type="file" name="import_file" id="input_import_file" /> </div> <input type="radio" id="import_local_storage" name="import_type" value="local_storage" disabled="disabled" /> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5RC1-19179-gef43e2f
by Madhura Jayaratne 18 Sep '11

18 Sep '11

The branch, master has been updated via ef43e2fce8ff8aa5aaf455fd03fb27531ce60ccb (commit) via d2276d5ddab9f3f0bc6a47cf0a713f7c5a08e417 (commit) from 20ca1e471c61f8c3c0497f71ab182a3f7b83fc15 (commit) - Log ----------------------------------------------------------------- commit ef43e2fce8ff8aa5aaf455fd03fb27531ce60ccb Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Sep 18 14:47:26 2011 +0530 Proper handling of set type columns in zoom editor commit d2276d5ddab9f3f0bc6a47cf0a713f7c5a08e417 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Sep 18 12:10:46 2011 +0530 Avoid b'null' and b'' for bit fields. No space before comma and single space after comma in SQL query ----------------------------------------------------------------------- Summary of changes: js/tbl_zoom_plot.js | 33 +++++++++++++++++++++++---------- 1 files changed, 23 insertions(+), 10 deletions(-) diff --git a/js/tbl_zoom_plot.js b/js/tbl_zoom_plot.js index 3e760df..3f8d00b 100644 --- a/js/tbl_zoom_plot.js +++ b/js/tbl_zoom_plot.js @@ -273,6 +273,11 @@ $(document).ready(function() { if (key != 'where_clause') { var oldVal = selectedRow[key]; var newVal = ($('#fields_null_id_' + it).attr('checked')) ? null : $('#fieldID_' + it).val(); + if (newVal instanceof Array) { // when the column is of type SET + newVal = $('#fieldID_' + it).map(function(){ + return $(this).val(); + }).get().join(","); + } if (oldVal != newVal) { selectedRow[key] = newVal; newValues[key] = newVal; @@ -383,18 +388,20 @@ $(document).ready(function() { if (key != 'where_clause') { sql_query += '`' + key + '`=' ; var value = newValues[key]; - if (sqlTypes[key] != null) { - if (sqlTypes[key] == 'bit') { - sql_query += 'b\'' + value + '\' ,'; + if (sqlTypes[key] != null && value != null) { + if (sqlTypes[key] == 'bit' && value != '') { + sql_query += 'b\'' + value + '\', '; + } else { + sql_query += '\'\', '; } } else if (!isNumeric(value) && value != null) { - sql_query += '\'' + value + '\' ,'; + sql_query += '\'' + value + '\', '; } else { - sql_query += value + ' ,'; + sql_query += value + ', '; } } } - sql_query = sql_query.substring(0, sql_query.length - 1); + sql_query = sql_query.substring(0, sql_query.length - 2); sql_query += ' WHERE ' + PMA_urldecode(data[currentData]['where_clause']); //Post SQL query to sql.php @@ -479,12 +486,18 @@ $(document).ready(function() { $.post('tbl_zoom_select.php', post_params, function(data) { // Row is contained in data.row_info, now fill the displayResultForm with row values for (key in data.row_info) { + $field = $('#fieldID_' + fid); + $field_null = $('#fields_null_id_' + fid); if (data.row_info[key] == null) { - $('#fields_null_id_' + fid).attr('checked', true); - $('#fieldID_' + fid).val(''); + $field_null.attr('checked', true); + $field.val(''); } else { - $('#fields_null_id_' + fid).attr('checked', false); - $('#fieldID_' + fid).val(data.row_info[key]); + $field_null.attr('checked', false); + if ($field.attr('multiple')) { // when the column is of type SET + $field.val(data.row_info[key].split(',')); + } else { + $field.val(data.row_info[key]); + } } fid++; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5RC1-19177-g20ca1e4
by Madhura Jayaratne 18 Sep '11

18 Sep '11

The branch, master has been updated via 20ca1e471c61f8c3c0497f71ab182a3f7b83fc15 (commit) from 1ff96183cb3031b3cacfd54169fff39717ed8982 (commit) - Log ----------------------------------------------------------------- commit 20ca1e471c61f8c3c0497f71ab182a3f7b83fc15 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Sep 18 11:54:59 2011 +0530 bug #3410999 - Zoom search, problems with data editor ----------------------------------------------------------------------- Summary of changes: js/tbl_zoom_plot.js | 11 +++++++++- libraries/tbl_select.lib.php | 46 ++++++++++++++++++++++++++++++----------- tbl_zoom_select.php | 9 +++++-- 3 files changed, 49 insertions(+), 17 deletions(-) diff --git a/js/tbl_zoom_plot.js b/js/tbl_zoom_plot.js index df73c3c..3e760df 100644 --- a/js/tbl_zoom_plot.js +++ b/js/tbl_zoom_plot.js @@ -265,6 +265,7 @@ $(document).ready(function() { //Find changed values by comparing form values with selectedRow Object var newValues = new Array();//Stores the values changed from original + var sqlTypes = new Array(); var it = 4; var xChange = false; var yChange = false; @@ -283,6 +284,10 @@ $(document).ready(function() { data[currentData][yLabel] = newVal; } } + var $input = $('#fieldID_' + it); + if ($input.hasClass('bit')) { + sqlTypes[key] = 'bit'; + } } it++; } //End data update @@ -378,7 +383,11 @@ $(document).ready(function() { if (key != 'where_clause') { sql_query += '`' + key + '`=' ; var value = newValues[key]; - if (!isNumeric(value) && value != null) { + if (sqlTypes[key] != null) { + if (sqlTypes[key] == 'bit') { + sql_query += 'b\'' + value + '\' ,'; + } + } else if (!isNumeric(value) && value != null) { sql_query += '\'' + value + '\' ,'; } else { sql_query += value + ' ,'; diff --git a/libraries/tbl_select.lib.php b/libraries/tbl_select.lib.php index 848eb28..53ffcb7 100644 --- a/libraries/tbl_select.lib.php +++ b/libraries/tbl_select.lib.php @@ -154,11 +154,13 @@ function PMA_tbl_getSubTabs() * @param int $foreignMaxLimit Max limit of displaying foreign elements * @param array $fields Array of search criteria inputs * @param bool $in_fbs Whether we are in 'function based search' + * @param bool $in_edit Whether in search mode + * or edit mode (used for zoom search) * * @return string HTML content for viewing foreing data and elements * for search criteria input. */ -function PMA_getForeignFields_Values($foreigners, $foreignData, $field, $tbl_fields_type, $i, $db, $table, $titles, $foreignMaxLimit, $fields, $in_fbs = false) +function PMA_getForeignFields_Values($foreigners, $foreignData, $field, $tbl_fields_type, $i, $db, $table, $titles, $foreignMaxLimit, $fields, $in_fbs = false, $in_edit = false) { $str = ''; if ($foreigners && isset($foreigners[$field]) && is_array($foreignData['disp_row'])) { @@ -208,23 +210,39 @@ EOT; $str .= '</span>'; } - } elseif (strncasecmp($tbl_fields_type[$i], 'enum', 4) == 0) { - // e n u m s - $enum_value=explode(', ', str_replace("'", '', substr($tbl_fields_type[$i], 5, -1))); - $cnt_enum_value = count($enum_value); - $str .= '<select name="fields[' . ($i) . '][]" id="fieldID_' . $i .'"' - .' multiple="multiple" size="' . min(3, $cnt_enum_value) . '">' . "\n"; + } elseif (strncasecmp($tbl_fields_type[$i], 'enum', 4) == 0 + || (strncasecmp($tbl_fields_type[$i], 'set', 3) == 0 && $in_edit) + ) { + // e n u m s a n d s e t s - for ($j = 0; $j < $cnt_enum_value; $j++) { + // Enum in edit mode --> dropdown + // Enum in search mode --> multiselect + // Set in edit mode --> multiselect + // Set in search mode --> input (skipped here, so the 'else' + // section would handle it) + + $value = explode(', ', str_replace("'", '', substr($tbl_fields_type[$i], 5, -1))); + $cnt_value = count($value); + + if ((strncasecmp($tbl_fields_type[$i], 'enum', 4) && ! $in_edit) + || (strncasecmp($tbl_fields_type[$i], 'set', 3) && $in_edit) + ) { + $str .= '<select name="fields[' . ($i) . '][]" id="fieldID_' . $i .'">' . "\n"; + } else { + $str .= '<select name="fields[' . ($i) . '][]" id="fieldID_' . $i .'"' + . ' multiple="multiple" size="' . min(3, $cnt_value) . '">' . "\n"; + } + + for ($j = 0; $j < $cnt_value; $j++) { if (isset($fields[$i]) && is_array($fields[$i]) - && in_array($enum_value[$j], $fields[$i]) + && in_array($value[$j], $fields[$i]) ) { - $str .= '<option value="' . $enum_value[$j] . '" Selected>' - . $enum_value[$j] . '</option>'; + $str .= '<option value="' . $value[$j] . '" Selected>' + . $value[$j] . '</option>'; } else { - $str .= '<option value="' . $enum_value[$j] . '">' - . $enum_value[$j] . '</option>'; + $str .= '<option value="' . $value[$j] . '">' + . $value[$j] . '</option>'; } } // end for $str .= '</select>' . "\n"; @@ -238,6 +256,8 @@ EOT; $the_class .= ' datefield'; } elseif ($type == 'datetime' || substr($type, 0, 9) == 'timestamp') { $the_class .= ' datetimefield'; + } elseif (substr($type, 0, 3) == 'bit') { + $the_class .= ' bit'; } if (isset($fields[$i]) && is_string($fields[$i])) { diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php index a110ace..548b03f 100644 --- a/tbl_zoom_select.php +++ b/tbl_zoom_select.php @@ -438,13 +438,16 @@ if (isset($zoom_submit) && $inputs[0] != 'pma_null' && $inputs[1] != 'pma_null' ?> <tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; $odd_row = ! $odd_row; ?>"> <th><?php echo htmlspecialchars($fields_list[$i - 4]); ?></th> - <th><?php echo '<input type="checkbox" class="checkbox_null" name="fields_null[ ' - . $i . ' ]" id="fields_null_id_' . $i . '" />'; ?> + <th><?php echo ($fields_null[$i - 4] == 'YES') + ? '<input type="checkbox" class="checkbox_null" name="fields_null[ ' + . $i . ' ]" id="fields_null_id_' . $i . '" />' + : ''; ?> </th> <th> <?php echo PMA_getForeignFields_Values( $foreigners, $foreignData, $fieldpopup, $tbl_fields_type, - $i, $db, $table, $titles, $GLOBALS['cfg']['ForeignKeyMaxLimit'], '' + $i, $db, $table, $titles, + $GLOBALS['cfg']['ForeignKeyMaxLimit'], '', false, true ); ?> </th> </tr> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5RC1-19176-g1ff9618
by Madhura Jayaratne 17 Sep '11

17 Sep '11

The branch, master has been updated via 1ff96183cb3031b3cacfd54169fff39717ed8982 (commit) via 4581e53735ac67e609ac4f4ff06db25e4b70849d (commit) via 7b4bb1c8657c1de0f9564fd0929ca0a0eaa515b3 (commit) from dad70b66d913ee1b0cac4ce3e7bd8bbff1728ada (commit) - Log ----------------------------------------------------------------- commit 1ff96183cb3031b3cacfd54169fff39717ed8982 Merge: 4581e53 dad70b6 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Sep 17 22:00:01 2011 +0530 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 4581e53735ac67e609ac4f4ff06db25e4b70849d Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Sep 17 21:57:10 2011 +0530 bug #3410984 - Zoom search, checkboxes and fields not being reset commit 7b4bb1c8657c1de0f9564fd0929ca0a0eaa515b3 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Sep 17 21:46:57 2011 +0530 Coding style improvements ----------------------------------------------------------------------- Summary of changes: js/tbl_zoom_plot.js | 4 +- tbl_zoom_select.php | 200 ++++++++++++++++++++++++++++++--------------------- 2 files changed, 122 insertions(+), 82 deletions(-) diff --git a/js/tbl_zoom_plot.js b/js/tbl_zoom_plot.js index 788ca63..df73c3c 100644 --- a/js/tbl_zoom_plot.js +++ b/js/tbl_zoom_plot.js @@ -469,10 +469,12 @@ $(document).ready(function() { }; $.post('tbl_zoom_select.php', post_params, function(data) { // Row is contained in data.row_info, now fill the displayResultForm with row values - for ( key in data.row_info) { + for (key in data.row_info) { if (data.row_info[key] == null) { $('#fields_null_id_' + fid).attr('checked', true); + $('#fieldID_' + fid).val(''); } else { + $('#fields_null_id_' + fid).attr('checked', false); $('#fieldID_' + fid).val(data.row_info[key]); } fid++; diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php index cf8a64f..a110ace 100644 --- a/tbl_zoom_select.php +++ b/tbl_zoom_select.php @@ -37,13 +37,14 @@ $GLOBALS['js_include'][] = 'jquery/timepicker.js'; if (isset($_REQUEST['get_data_row']) && $_REQUEST['get_data_row'] == true) { $extra_data = array(); - $row_info_query = 'SELECT * FROM `' . $_REQUEST['db'] . '`.`' . $_REQUEST['table'] . '` WHERE ' . $_REQUEST['where_clause']; - $result = PMA_DBI_query( $row_info_query . ";" , null, PMA_DBI_QUERY_STORE); + $row_info_query = 'SELECT * FROM `' . $_REQUEST['db'] . '`.`' + . $_REQUEST['table'] . '` WHERE ' . $_REQUEST['where_clause']; + $result = PMA_DBI_query($row_info_query . ";", null, PMA_DBI_QUERY_STORE); $fields_meta = PMA_DBI_get_fields_meta($result); while ($row = PMA_DBI_fetch_assoc($result)) { $extra_data['row_info'] = $row; } - PMA_ajaxResponse(NULL, true, $extra_data); + PMA_ajaxResponse(null, true, $extra_data); } $titles['Browse'] = PMA_tbl_setTitle($GLOBALS['cfg']['PropertiesIconic'], $pmaThemeImage); @@ -83,7 +84,7 @@ $foreigners = PMA_getForeigners($db, $table); $flag = 1; $tbl_fields_type = $tbl_fields_collation = $tbl_fields_null = array(); if (! isset($zoom_submit) && ! isset($inputs)) { - $dataLabel = PMA_getDisplayField($db,$table); + $dataLabel = PMA_getDisplayField($db, $table); } ?> <div id="sqlqueryresults"></div> @@ -114,7 +115,8 @@ if (isset($inputs) && ($inputs[0] != 'pma_null' || $inputs[1] != 'pma_null')) { */ ?> -<form method="post" action="tbl_zoom_select.php" name="insertForm" id="zoom_search_form" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : ''); ?>> +<form method="post" action="tbl_zoom_select.php" name="insertForm" id="zoom_search_form" + <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : ''); ?>> <?php echo PMA_generate_common_hidden_inputs($db, $table); ?> <input type="hidden" name="goto" value="<?php echo $goto; ?>" /> <input type="hidden" name="back" value="tbl_zoom_select.php" /> @@ -135,28 +137,29 @@ for ($i = 0; $i < 4; $i++) { echo __("Additional search criteria"); echo "</td></tr>"; } -?> + ?> <tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; $odd_row = ! $odd_row; ?>"> <th><select name="inputs[]" id="<?php echo 'tableid_' . $i; ?>" > - <option value="<?php echo 'pma_null'; ?>"><?php echo __('None'); ?> </option> + <option value="<?php echo 'pma_null'; ?>"><?php echo __('None'); ?></option> <?php for ($j = 0 ; $j < $fields_cnt ; $j++) { if (isset($inputs[$i]) && $inputs[$i] == htmlspecialchars($fields_list[$j])) {?> - <option value="<?php echo htmlspecialchars($fields_list[$j]);?>" selected="selected"><?php echo htmlspecialchars($fields_list[$j]);?></option> + <option value="<?php echo htmlspecialchars($fields_list[$j]);?>" selected="selected"> + <?php echo htmlspecialchars($fields_list[$j]);?></option> <?php } else { ?> - <option value="<?php echo htmlspecialchars($fields_list[$j]);?>"><?php echo htmlspecialchars($fields_list[$j]);?></option> + <option value="<?php echo htmlspecialchars($fields_list[$j]);?>"> + <?php echo htmlspecialchars($fields_list[$j]);?></option> <?php } } ?> </select></th> - <td><?php if(isset($tbl_fields_type[$i]))echo $tbl_fields_type[$i]; ?></td> - <td><?php if(isset($tbl_fields_collation[$i]))echo $tbl_fields_collation[$i]; ?></td> - -<td> -<?php + <td><?php if (isset($tbl_fields_type[$i])) echo $tbl_fields_type[$i]; ?></td> + <td><?php if (isset($tbl_fields_collation[$i])) echo $tbl_fields_collation[$i]; ?></td> + <td> + <?php if (isset($inputs) && $inputs[$i] != 'pma_null') { ?> - <select name="zoomFunc[]"> + <select name="zoomFunc[]"> <?php if (strncasecmp($tbl_fields_type[$i], 'enum', 4) == 0) { foreach ($GLOBALS['cfg']['EnumOperators'] as $fc) { @@ -209,34 +212,41 @@ for ($i = 0; $i < 4; $i++) { } } } - ?> - </select> - </td> - <td> - <?php + ?> + </select> + </td> + <td> + <?php $field = $inputs[$i]; $foreignData = PMA_getForeignData($foreigners, $field, false, '', ''); if (isset($fields)) { - echo PMA_getForeignFields_Values($foreigners, $foreignData, $field, $tbl_fields_type, $i ,$db, $table, $titles, $GLOBALS['cfg']['ForeignKeyMaxLimit'], $fields); + echo PMA_getForeignFields_Values( + $foreigners, $foreignData, $field, $tbl_fields_type, $i, $db, + $table, $titles, $GLOBALS['cfg']['ForeignKeyMaxLimit'], $fields + ); } else { - echo PMA_getForeignFields_Values($foreigners, $foreignData, $field, $tbl_fields_type, $i ,$db, $table, $titles, $GLOBALS['cfg']['ForeignKeyMaxLimit'], ''); + echo PMA_getForeignFields_Values( + $foreigners, $foreignData, $field, $tbl_fields_type, $i, $db, + $table, $titles, $GLOBALS['cfg']['ForeignKeyMaxLimit'], '' + ); } } else { ?> - </td><td></td> + </td><td></td> <?php } ?> </tr> - - <tr><td><input type="hidden" name="types[<?php echo $i; ?>]" id="types_<?php echo $i; ?>" + <tr><td> + <input type="hidden" name="types[<?php echo $i; ?>]" id="types_<?php echo $i; ?>" value="<?php if(isset($tbl_fields_type[$i]))echo $tbl_fields_type[$i]; ?>" /> - <input type="hidden" name="collations[<?php echo $i; ?>]" - value="<?php if(isset($tbl_fields_collation[$i]))echo $tbl_fields_collation[$i]; ?>" /></td></tr> + <input type="hidden" name="collations[<?php echo $i; ?>]" + value="<?php if(isset($tbl_fields_collation[$i]))echo $tbl_fields_collation[$i]; ?>" /> + </td></tr> -<?php + <?php }//end for ?> </tbody> @@ -250,7 +260,7 @@ for ($i = 0; $i < 4; $i++) { //Set default datalabel if not selected if (isset($zoom_submit) && $inputs[0] != 'pma_null' && $inputs[1] != 'pma_null') { if ($dataLabel == '') { - $dataLabel = PMA_getDisplayField($db,$table); + $dataLabel = PMA_getDisplayField($db, $table); } } ?> @@ -261,13 +271,15 @@ if (isset($zoom_submit) && $inputs[0] != 'pma_null' && $inputs[1] != 'pma_null') <?php for ($j = 0; $j < $fields_cnt; $j++) { if (isset($dataLabel) && $dataLabel == htmlspecialchars($fields_list[$j])) { -?> - <option value="<?php echo htmlspecialchars($fields_list[$j]);?>" selected="selected"> <?php echo htmlspecialchars($fields_list[$j]);?></option> -<?php + ?> + <option value="<?php echo htmlspecialchars($fields_list[$j]);?>" selected="selected"> + <?php echo htmlspecialchars($fields_list[$j]);?></option> + <?php } else { -?> - <option value="<?php echo htmlspecialchars($fields_list[$j]);?>" > <?php echo htmlspecialchars($fields_list[$j]);?></option> -<?php + ?> + <option value="<?php echo htmlspecialchars($fields_list[$j]);?>" > + <?php echo htmlspecialchars($fields_list[$j]);?></option> + <?php } } ?> @@ -321,8 +333,14 @@ if (isset($zoom_submit) && $inputs[0] != 'pma_null' && $inputs[1] != 'pma_null' $cnt_func = count($zoomFunc[$i]); $func_type = $zoomFunc[$i]; list($charsets[$i]) = explode('_', $collations[$i]); - $unaryFlag = (isset($GLOBALS['cfg']['UnaryOperators'][$func_type]) && $GLOBALS['cfg']['UnaryOperators'][$func_type] == 1) ? true : false; - $whereClause = PMA_tbl_search_getWhereClause($fields[$i],$inputs[$i], $types[$i], $collations[$i], $func_type, $unaryFlag); + $unaryFlag = (isset($GLOBALS['cfg']['UnaryOperators'][$func_type]) + && $GLOBALS['cfg']['UnaryOperators'][$func_type] == 1) + ? true + : false; + $whereClause = PMA_tbl_search_getWhereClause( + $fields[$i], $inputs[$i], $types[$i], + $collations[$i], $func_type, $unaryFlag + ); if ($whereClause) { $w[] = $whereClause; } @@ -335,7 +353,7 @@ if (isset($zoom_submit) && $inputs[0] != 'pma_null' && $inputs[1] != 'pma_null' /* * Query execution part */ - $result = PMA_DBI_query($sql_query . ";" , null, PMA_DBI_QUERY_STORE); + $result = PMA_DBI_query($sql_query . ";", null, PMA_DBI_QUERY_STORE); $fields_meta = PMA_DBI_get_fields_meta($result); while ($row = PMA_DBI_fetch_assoc($result)) { //Need a row with indexes as 0,1,2 for the PMA_getUniqueCondition hence using a temporary array @@ -349,81 +367,101 @@ if (isset($zoom_submit) && $inputs[0] != 'pma_null' && $inputs[1] != 'pma_null' //Append it to row array as where_clause $row['where_clause'] = $uniqueCondition[0]; if ($dataLabel == $inputs[0] || $dataLabel == $inputs[1]) { - $data[] = array($inputs[0] => $row[$inputs[0]], $inputs[1] => $row[$inputs[1]], 'where_clause' => $uniqueCondition[0]); + $data[] = array( + $inputs[0] => $row[$inputs[0]], + $inputs[1] => $row[$inputs[1]], + 'where_clause' => $uniqueCondition[0] + ); } elseif ($dataLabel) { - $data[] = array($inputs[0] => $row[$inputs[0]], $inputs[1] => $row[$inputs[1]], $dataLabel => $row[$dataLabel], 'where_clause' => $uniqueCondition[0]); + $data[] = array( + $inputs[0] => $row[$inputs[0]], + $inputs[1] => $row[$inputs[1]], + $dataLabel => $row[$dataLabel], + 'where_clause' => $uniqueCondition[0] + ); } else { - $data[] = array($inputs[0] => $row[$inputs[0]], $inputs[1] => $row[$inputs[1]], $dataLabel => '', 'where_clause' => $uniqueCondition[0]); + $data[] = array( + $inputs[0] => $row[$inputs[0]], + $inputs[1] => $row[$inputs[1]], + $dataLabel => '', + 'where_clause' => $uniqueCondition[0] + ); } } /* * Form for displaying point data and also the scatter plot */ -?> - <form method="post" action="tbl_zoom_select.php" name="displayResultForm" id="zoom_display_form" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : ''); ?>> + ?> + <form method="post" action="tbl_zoom_select.php" name="displayResultForm" id="zoom_display_form" + <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : ''); ?>> <?php echo PMA_generate_common_hidden_inputs($db, $table); ?> <input type="hidden" name="goto" value="<?php echo $goto; ?>" /> <input type="hidden" name="back" value="tbl_zoom_select.php" /> <fieldset id="displaySection"> - <legend><?php echo __('Browse/Edit the points') ?></legend> -<center> -<?php + <legend><?php echo __('Browse/Edit the points') ?></legend> + <center> + <?php //JSON encode the data(query result) if (isset($zoom_submit) && ! empty($data)) { -?> - <div id='resizer' style="width:600px;height:400px"> -<center> <a href="#" onClick="displayHelp();"><?php echo __('How to use'); ?></a> </center> - <div id="querydata" style="display:none"> -<?php + ?> + <div id='resizer' style="width:600px;height:400px"> + <center><a href="#" onClick="displayHelp();"><?php echo __('How to use'); ?></a></center> + <div id="querydata" style="display:none"> + <?php echo json_encode($data); -?> - </div> - <div id="querychart" style="float:right"></div> - </div> - <?php + ?> + </div> + <div id="querychart" style="float:right"></div> + </div> + <?php } -?> - </center> - <fieldset id='dataDisplay' style="display:none"> + ?> + </center> + <fieldset id='dataDisplay' style="display:none"> <fieldset> <table class="data"> - <thead> - <tr> -<th> <?php echo __('Column'); ?> </th> -<th> <?php echo __('Null'); ?> </th> - <th> <?php echo __('Value'); ?> </th> -</tr> - </thead> - <tbody> -<?php + <thead> + <tr> + <th> <?php echo __('Column'); ?> </th> + <th> <?php echo __('Null'); ?> </th> + <th> <?php echo __('Value'); ?> </th> + </tr> + </thead> + <tbody> + <?php $odd_row = true; for ($i = 4; $i < $fields_cnt + 4; $i++) { $tbl_fields_type[$i] = $fields_type[$i - 4]; $fieldpopup = $fields_list[$i - 4]; $foreignData = PMA_getForeignData($foreigners, $fieldpopup, false, '', ''); -?> - <tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; $odd_row = ! $odd_row; ?>"> - <th><?php echo htmlspecialchars($fields_list[$i - 4]); ?></th> - <th><?php echo '<input type="checkbox" class="checkbox_null" name="fields_null[ ' . $i . ' ]" id="fields_null_id_' . $i . '" />'; ?></th> - <th><?php echo PMA_getForeignFields_Values($foreigners, $foreignData, $fieldpopup, $tbl_fields_type, $i, $db, $table, $titles,$GLOBALS['cfg']['ForeignKeyMaxLimit'], '' ); ?> </th> - </tr> -<?php + ?> + <tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; $odd_row = ! $odd_row; ?>"> + <th><?php echo htmlspecialchars($fields_list[$i - 4]); ?></th> + <th><?php echo '<input type="checkbox" class="checkbox_null" name="fields_null[ ' + . $i . ' ]" id="fields_null_id_' . $i . '" />'; ?> + </th> + <th> <?php + echo PMA_getForeignFields_Values( + $foreigners, $foreignData, $fieldpopup, $tbl_fields_type, + $i, $db, $table, $titles, $GLOBALS['cfg']['ForeignKeyMaxLimit'], '' + ); ?> + </th> + </tr> + <?php } -?> - </tbody> + ?> + </tbody> </table> </fieldset> <fieldset class="tblFooters"> <input type="submit" id="submitForm" name="edit_point" value="<?php echo __('Submit'); ?>" /> </fieldset> - </fieldset> - + </fieldset> </fieldset> <input type="hidden" id="queryID" name="sql_query" /> </form> - </fieldset> -<?php + <?php } require './libraries/footer.inc.php'; ?> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5RC1-19173-gdad70b6
by Rouslan Placella 17 Sep '11

17 Sep '11

The branch, master has been updated via dad70b66d913ee1b0cac4ce3e7bd8bbff1728ada (commit) from d01bb41213b9241e0d45b5a3f63b6869bb85a071 (commit) - Log ----------------------------------------------------------------- commit dad70b66d913ee1b0cac4ce3e7bd8bbff1728ada Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Sep 17 15:54:27 2011 +0100 Fixed broken retreival of triggers for a specific table ----------------------------------------------------------------------- Summary of changes: libraries/database_interface.lib.php | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index 709e15f..f0520a7 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -1603,12 +1603,12 @@ function PMA_DBI_get_triggers($db, $table = '', $delimiter = '//') // Note: in http://dev.mysql.com/doc/refman/5.0/en/faqs-triggers.html // their example uses WHERE TRIGGER_SCHEMA='dbname' so let's use this // instead of WHERE EVENT_OBJECT_SCHEMA='dbname' - $query = "SELECT TRIGGER_SCHEMA, TRIGGER_NAME, EVENT_MANIPULATION, EVENT_OBJECT_TABLE, ACTION_TIMING, ACTION_STATEMENT, EVENT_OBJECT_SCHEMA, EVENT_OBJECT_TABLE, DEFINER FROM information_schema.TRIGGERS WHERE TRIGGER_SCHEMA= '" . PMA_sqlAddSlashes($db,true) . "';"; + $query = "SELECT TRIGGER_SCHEMA, TRIGGER_NAME, EVENT_MANIPULATION, EVENT_OBJECT_TABLE, ACTION_TIMING, ACTION_STATEMENT, EVENT_OBJECT_SCHEMA, EVENT_OBJECT_TABLE, DEFINER FROM information_schema.TRIGGERS WHERE TRIGGER_SCHEMA= '" . PMA_sqlAddSlashes($db) . "'"; if (! empty($table)) { - $query .= " AND EVENT_OBJECT_TABLE = '" . PMA_sqlAddSlashes($table, true) . "';"; + $query .= " AND EVENT_OBJECT_TABLE = '" . PMA_sqlAddSlashes($table) . "';"; } } else { - $query = "SHOW TRIGGERS FROM " . PMA_backquote(PMA_sqlAddSlashes($db,true)); + $query = "SHOW TRIGGERS FROM " . PMA_backquote($db); if (! empty($table)) { $query .= " LIKE '" . PMA_sqlAddSlashes($table, true) . "';"; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5RC1-19172-gd01bb41
by Rouslan Placella 17 Sep '11

17 Sep '11

The branch, master has been updated via d01bb41213b9241e0d45b5a3f63b6869bb85a071 (commit) via 3f5662ff11a16b7942a9a68ca3ceff4380bce7d4 (commit) via 82be0e66334190bfc0422270fe5bb422ac7aae65 (commit) via ad4fa3547b78cfe9e968c251d06a83b8fa1a9219 (commit) via af4e15b6ff3e3293d810f694a677b4a5b16ab4ce (commit) via 6dbab1fb38a97d3c6c88c382a9318e80fa2c5c2e (commit) via d39db8e3b604743489582c20f39456a83c3bb387 (commit) via 537c319abb815dfeaf01352df9ee1b93a3407868 (commit) via d47fdde6c0d40acdbb6b2b9d8e127a5278b552fb (commit) via dd566ec76c0e182f6367dcc157b1cb4eeb30ff29 (commit) from 85a990fabd4a3239f011f8d168be8558a802f96a (commit) - Log ----------------------------------------------------------------- commit d01bb41213b9241e0d45b5a3f63b6869bb85a071 Merge: 3f5662f 85a990f Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Sep 17 15:28:17 2011 +0100 Merge remote-tracking branch 'origin/master' commit 3f5662ff11a16b7942a9a68ca3ceff4380bce7d4 Merge: dc35ecf 82be0e6 Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Sep 17 15:21:53 2011 +0100 Merge branch 'ajax_message' commit 82be0e66334190bfc0422270fe5bb422ac7aae65 Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Sep 17 15:18:55 2011 +0100 Ajax message "Processing request" also should not disappear and should not be dismissable commit ad4fa3547b78cfe9e968c251d06a83b8fa1a9219 Author: Rouslan Placella <rouslan(a)placella.com> Date: Wed Sep 14 16:09:15 2011 +0100 Fixed comment commit af4e15b6ff3e3293d810f694a677b4a5b16ab4ce Merge: 6dbab1f abc1d3c Author: Rouslan Placella <rouslan(a)placella.com> Date: Wed Sep 14 15:58:04 2011 +0100 Merge branch 'master' into ajax_message commit 6dbab1fb38a97d3c6c88c382a9318e80fa2c5c2e Author: Rouslan Placella <rouslan(a)placella.com> Date: Wed Sep 14 15:28:30 2011 +0100 Prevent error notifications from disappearing in Routines, Triggers and Events implemetatations commit d39db8e3b604743489582c20f39456a83c3bb387 Author: Rouslan Placella <rouslan(a)placella.com> Date: Wed Sep 14 15:27:11 2011 +0100 Improved dismissable Ajax notifications, so that error messages don't disappear commit 537c319abb815dfeaf01352df9ee1b93a3407868 Merge: d47fdde 6b09880 Author: Rouslan Placella <rouslan(a)placella.com> Date: Wed Sep 14 13:00:03 2011 +0100 Merge branch 'master' into ajax_message commit d47fdde6c0d40acdbb6b2b9d8e127a5278b552fb Merge: dd566ec dd0b139 Author: Rouslan Placella <rouslan(a)placella.com> Date: Sat Sep 10 21:11:53 2011 +0100 Merge branch 'master' into ajax_message commit dd566ec76c0e182f6367dcc157b1cb4eeb30ff29 Author: Rouslan Placella <rouslan(a)placella.com> Date: Tue Aug 23 19:53:57 2011 +0100 Make ajax notifications dismissable ----------------------------------------------------------------------- Summary of changes: js/functions.js | 146 ++++++++++++++++++++++++++++++++++++++++++++-------- js/messages.php | 1 + js/rte/common.js | 8 ++-- js/rte/routines.js | 4 +- 4 files changed, 131 insertions(+), 28 deletions(-) diff --git a/js/functions.js b/js/functions.js index b0fc717..f67b6a9 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1291,62 +1291,136 @@ $(document).ready(function(){ /** * Show a message on the top of the page for an Ajax request * - * @param var message string containing the message to be shown. + * Sample usage: + * + * 1) var $msg = PMA_ajaxShowMessage(); + * This will show a message that reads "Loading...". Such a message will not + * disappear automatically and cannot be dismissed by the user. To remove this + * message either the PMA_ajaxRemoveMessage($msg) function must be called or + * another message must be show with PMA_ajaxShowMessage() function. + * + * 2) var $msg = PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']); + * This is a special case. The behaviour is same as above, + * just with a different message + * + * 3) var $msg = PMA_ajaxShowMessage('The operation was successful'); + * This will show a message that will disappear automatically and it can also + * be dismissed by the user. + * + * 4) var $msg = PMA_ajaxShowMessage('Some error', false); + * This will show a message that will not disappear automatically, but it + * can be dismissed by the user after he has finished reading it. + * + * @param string message string containing the message to be shown. * optional, defaults to 'Loading...' - * @param var timeout number of milliseconds for the message to be visible - * optional, defaults to 5000 + * @param mixed timeout number of milliseconds for the message to be visible + * optional, defaults to 5000. If set to 'false', the + * notification will never disappear * @return jQuery object jQuery Element that holds the message div + * this object can be passed to PMA_ajaxRemoveMessage() + * to remove the notification */ function PMA_ajaxShowMessage(message, timeout) { - - //Handle the case when a empty data.message is passed. We don't want the empty message + /** + * @var self_closing Whether the notification will automatically disappear + */ + var self_closing = true; + /** + * @var dismissable Whether the user will be able to remove + * the notification by clicking on it + */ + var dismissable = true; + // Handle the case when a empty data.message is passed. + // We don't want the empty message if (message == '') { return true; } else if (! message) { // If the message is undefined, show the default message = PMA_messages['strLoading']; - } - - /** - * @var timeout Number of milliseconds for which the message will be visible - * @default 5000 ms - */ - if (! timeout) { + dismissable = false; + self_closing = false; + } else if (message == PMA_messages['strProcessingRequest']) { + // This is another case where the message should not disappear + dismissable = false; + self_closing = false; + } + // Figure out whether (or after how long) to remove the notification + if (timeout == undefined) { timeout = 5000; + } else if (timeout === false) { + self_closing = false; } - // Create a parent element for the AJAX messages, if necessary if ($('#loading_parent').length == 0) { $('<div id="loading_parent"></div>') .insertBefore("#serverinfo"); } - // Update message count to create distinct message elements every time ajax_message_count++; - // Remove all old messages, if any $(".ajax_notification[id^=ajax_message_num]").remove(); - /** * @var $retval a jQuery object containing the reference * to the created AJAX message */ - var $retval = $('<span class="ajax_notification" id="ajax_message_num_' + ajax_message_count + '"></span>') - .hide() - .appendTo("#loading_parent") - .html(message) - .fadeIn('medium') + var $retval = $( + '<span class="ajax_notification" id="ajax_message_num_' + + ajax_message_count + + '"></span>' + ) + .hide() + .appendTo("#loading_parent") + .html(message) + .fadeIn('medium'); + // If the notification is self-closing we should create a callback to remove it + if (self_closing) { + $retval .delay(timeout) .fadeOut('medium', function() { + if ($(this).is('.dismissable')) { + // Here we should destroy the qtip instance, but + // due to a bug in qtip's implementation we can + // only hide it without throwing JS errors. + $(this).qtip('hide'); + } + // Remove the notification $(this).remove(); }); + } + // If the notification is dismissable we need to add the relevant class to it + // and add a tooltip so that the users know that it can be removed + if (dismissable) { + $retval.addClass('dismissable').css('cursor', 'pointer'); + /** + * @var qOpts Options for "Dismiss notification" tooltip + */ + var qOpts = { + show: { + effect: { length: 0 }, + delay: 0 + }, + hide: { + effect: { length: 0 }, + delay: 0 + } + }; + /** + * Add a tooltip to the notification to let the user know that (s)he + * can dismiss the ajax notification by clicking on it. + */ + PMA_createqTip($retval, PMA_messages['strDismiss'], qOpts); + } return $retval; } /** * Removes the message shown for an Ajax operation when it's completed + * + * @param jQuery object jQuery Element that holds the notification + * + * @return nothing */ function PMA_ajaxRemoveMessage($this_msgbox) { @@ -1354,9 +1428,37 @@ function PMA_ajaxRemoveMessage($this_msgbox) $this_msgbox .stop(true, true) .fadeOut('medium'); + if ($this_msgbox.is('.dismissable')) { + // Here we should destroy the qtip instance, but + // due to a bug in qtip's implementation we can + // only hide it without throwing JS errors. + $this_msgbox.qtip('hide'); + } } } +$(document).ready(function() { + /** + * Allows the user to dismiss a notification + * created with PMA_ajaxShowMessage() + */ + $('.ajax_notification.dismissable').live('click', function () { + PMA_ajaxRemoveMessage($(this)); + }); + /** + * The below two functions hide the "Dismiss notification" tooltip when a user + * is hovering a link or button that is inside an ajax message + */ + $('.ajax_notification a, .ajax_notification button, .ajax_notification input') + .live('mouseover', function () { + $(this).parents('.ajax_notification').qtip('hide'); + }); + $('.ajax_notification a, .ajax_notification button, .ajax_notification input') + .live('mouseout', function () { + $(this).parents('.ajax_notification').qtip('show'); + }); +}); + /** * Hides/shows the "Open in ENUM/SET editor" message, depending on the data type of the column currently selected */ @@ -2895,7 +2997,7 @@ var toggleButton = function ($obj) { } else { $(this).addClass('isActive'); } - var $msg = PMA_ajaxShowMessage(PMA_messages['strLoading']); + var $msg = PMA_ajaxShowMessage(); var $container = $(this); var callback = $('.callback', this).text(); // Perform the actual toggle diff --git a/js/messages.php b/js/messages.php index daed474..96f759b 100644 --- a/js/messages.php +++ b/js/messages.php @@ -214,6 +214,7 @@ $js_messages['strErrorProcessingRequest'] = __('Error in Processing Request'); $js_messages['strDroppingColumn'] = __('Dropping Column'); $js_messages['strAddingPrimaryKey'] = __('Adding Primary Key'); $js_messages['strOK'] = __('OK'); +$js_messages['strDismiss'] = __('Click to dismiss this notification'); /* For db_operations.js */ $js_messages['strRenamingDatabases'] = __('Renaming Databases'); diff --git a/js/rte/common.js b/js/rte/common.js index 8523459..842f325 100644 --- a/js/rte/common.js +++ b/js/rte/common.js @@ -198,7 +198,7 @@ $(document).ready(function () { }); } } else { - PMA_ajaxShowMessage(data.error); + PMA_ajaxShowMessage(data.error, false); } }); // end $.post() } // end "if (RTE.validate())" @@ -245,7 +245,7 @@ $(document).ready(function () { // Execute item-specific code RTE.postDialogShow(data); } else { - PMA_ajaxShowMessage(data.error); + PMA_ajaxShowMessage(data.error, false); } }); // end $.get() }); // end $.live() @@ -301,7 +301,7 @@ $(document).ready(function () { var opts = {lineNumbers: true, matchBrackets: true, indentUnit: 4, mode: "text/x-mysql"}; CodeMirror.fromTextArea($elm[0], opts); } else { - PMA_ajaxShowMessage(data.error); + PMA_ajaxShowMessage(data.error, false); } }); // end $.get() }); // end $.live() @@ -370,7 +370,7 @@ $(document).ready(function () { // Show the query that we just executed PMA_slidingMessage(data.sql_query); } else { - PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error); + PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error, false); } }); // end $.get() }); // end $.PMA_confirm() diff --git a/js/rte/routines.js b/js/rte/routines.js index ac7a291..087b9d6 100644 --- a/js/rte/routines.js +++ b/js/rte/routines.js @@ -357,7 +357,7 @@ $(document).ready(function () { PMA_slidingMessage(data.message); $ajaxDialog.dialog('close'); } else { - PMA_ajaxShowMessage(data.error); + PMA_ajaxShowMessage(data.error, false); } }); }; @@ -388,7 +388,7 @@ $(document).ready(function () { PMA_slidingMessage(data.message); } } else { - PMA_ajaxShowMessage(data.error); + PMA_ajaxShowMessage(data.error, false); } }); // end $.get() }); // end $.live() hooks/post-receive -- phpMyAdmin

1 0