September 2011 - Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_5-14-g5a33e48
by Michal Čihař 19 Sep '11

19 Sep '11

The branch, QA_3_4 has been updated via 5a33e48992d49b12e3bbc9d1f755a5a2b5aa7b34 (commit) via b7d09b5bb865816bb357ceb357f6beb52d20afde (commit) from 6ac29b4791f8c31dd057d4ed981f26599a2cf4a3 (commit) - Log ----------------------------------------------------------------- commit 5a33e48992d49b12e3bbc9d1f755a5a2b5aa7b34 Merge: 6ac29b4 b7d09b5 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Sep 19 09:30:28 2011 +0200 Merge remote-tracking branch 'origin/MAINT_3_4_5' into QA_3_4 ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- phpMyAdmin

1 0

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

18 Sep '11

The branch, master has been updated via 3bec04a9b862499c0b73db3fcdcb269e84c5fe36 (commit) via 88682495fa42000932827a928f1f688145fd3a17 (commit) via 719e5591dd407f3f1e2b13be5fbd72ad48246454 (commit) via 59e7c2e09d34e827f9f8d5412d74ac6d0c407894 (commit) via 6bfcef485c78f3e676ca765737fb5fb5f146558c (commit) from effa795c79aef8afc9891433da89cebe998f65bd (commit) - Log ----------------------------------------------------------------- commit 3bec04a9b862499c0b73db3fcdcb269e84c5fe36 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Sep 18 22:27:32 2011 +0530 Always use curly braces with IF statements. Remove spaces commit 88682495fa42000932827a928f1f688145fd3a17 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Sep 18 22:22:23 2011 +0530 Wrap some lone lines commit 719e5591dd407f3f1e2b13be5fbd72ad48246454 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Sep 18 22:13:35 2011 +0530 Remove redundant if check commit 59e7c2e09d34e827f9f8d5412d74ac6d0c407894 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Sep 18 21:55:07 2011 +0530 These are Objects commit 6bfcef485c78f3e676ca765737fb5fb5f146558c Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Sep 18 20:53:53 2011 +0530 If data label is not set, do not show tooltips ----------------------------------------------------------------------- Summary of changes: js/tbl_zoom_plot.js | 174 +++++++++++++++++++++++++++++++++----------------- 1 files changed, 115 insertions(+), 59 deletions(-) diff --git a/js/tbl_zoom_plot.js b/js/tbl_zoom_plot.js index 665a534..ce3de9d 100644 --- a/js/tbl_zoom_plot.js +++ b/js/tbl_zoom_plot.js @@ -92,12 +92,14 @@ function getTimeStamp(val, type) { ** @param field: field type (as in database structure) **/ function getType(field) { - if (field.toString().search(/int/i) != -1 || field.toString().search(/decimal/i) != -1 || field.toString().search(/year/i) != -1) + if (field.toString().search(/int/i) != -1 || field.toString().search(/decimal/i) != -1 + || field.toString().search(/year/i) != -1) { return 'numeric'; - else if (field.toString().search(/time/i) != -1 || field.toString().search(/date/i) != -1) + } else if (field.toString().search(/time/i) != -1 || field.toString().search(/date/i) != -1) { return 'time'; - else + } else { return 'text'; + } } /** ** Converts a categorical array into numeric array @@ -264,36 +266,34 @@ $(document).ready(function() { event.preventDefault(); //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 newValues = new Object();//Stores the values changed from original + var sqlTypes = new Object(); var it = 4; var xChange = false; var yChange = false; for (key in selectedRow) { - 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; - if (key == xLabel) { - xChange = true; - data[currentData][xLabel] = newVal; - } else if (key == yLabel) { - yChange = true; - data[currentData][yLabel] = newVal; - } - } - var $input = $('#fieldID_' + it); - if ($input.hasClass('bit')) { - sqlTypes[key] = 'bit'; + 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; + if (key == xLabel) { + xChange = true; + data[currentData][xLabel] = newVal; + } else if (key == yLabel) { + yChange = true; + data[currentData][yLabel] = newVal; } } + var $input = $('#fieldID_' + it); + if ($input.hasClass('bit')) { + sqlTypes[key] = 'bit'; + } it++; } //End data update @@ -304,14 +304,17 @@ $(document).ready(function() { newSeries[0].marker = { symbol: 'circle' }; - //Logic similar to plot generation, replot only if xAxis changes or yAxis changes. Code includes a lot of checks so as to replot only when necessary + //Logic similar to plot generation, replot only if xAxis changes or yAxis changes. + //Code includes a lot of checks so as to replot only when necessary if (xChange) { xCord[currentData] = selectedRow[xLabel]; if (xType == 'numeric') { currentChart.series[0].data[currentData].update({ x : selectedRow[xLabel] }); currentChart.xAxis[0].setExtremes(Array.min(xCord) - 6, Array.max(xCord) + 6); } else if (xType == 'time') { - currentChart.series[0].data[currentData].update({ x : getTimeStamp(selectedRow[xLabel], $('#types_0').val())}); + currentChart.series[0].data[currentData].update({ + x : getTimeStamp(selectedRow[xLabel], $('#types_0').val()) + }); } else { var tempX = getCord(xCord); var tempY = getCord(yCord); @@ -322,9 +325,21 @@ $(document).ready(function() { $.each(data, function(key, value) { if (yType != 'text') { - newSeries[0].data.push({ name: value[dataLabel], x: tempX[0][i], y: value[yLabel], marker: {fillColor: colorCodes[i % 8]} , id: i } ); + newSeries[0].data.push({ + name: value[dataLabel], + x: tempX[0][i], + y: value[yLabel], + marker: {fillColor: colorCodes[i % 8]}, + id: i + }); } else { - newSeries[0].data.push({ name: value[dataLabel], x: tempX[0][i], y: tempY[0][i], marker: {fillColor: colorCodes[i % 8]} , id: i } ); + newSeries[0].data.push({ + name: value[dataLabel], + x: tempX[0][i], + y: tempY[0][i], + marker: {fillColor: colorCodes[i % 8]}, + id: i + }); } i++; }); @@ -348,7 +363,9 @@ $(document).ready(function() { currentChart.series[0].data[currentData].update({ y : selectedRow[yLabel] }); currentChart.yAxis[0].setExtremes(Array.min(yCord) - 6, Array.max(yCord) + 6); } else if (yType == 'time') { - currentChart.series[0].data[currentData].update({ y : getTimeStamp(selectedRow[yLabel], $('#types_1').val())}); + currentChart.series[0].data[currentData].update({ + y : getTimeStamp(selectedRow[yLabel], $('#types_1').val()) + }); } else { var tempX = getCord(xCord); var tempY = getCord(yCord); @@ -359,9 +376,21 @@ $(document).ready(function() { $.each(data, function(key, value) { if (xType != 'text' ) { - newSeries[0].data.push({ name: value[dataLabel], x: value[xLabel], y: tempY[0][i], marker: {fillColor: colorCodes[i % 8]} , id: i } ); + newSeries[0].data.push({ + name: value[dataLabel], + x: value[xLabel], + y: tempY[0][i], + marker: {fillColor: colorCodes[i % 8]}, + id: i + }); } else { - newSeries[0].data.push({ name: value[dataLabel], x: tempX[0][i], y: tempY[0][i], marker: {fillColor: colorCodes[i % 8]} , id: i } ); + newSeries[0].data.push({ + name: value[dataLabel], + x: tempX[0][i], + y: tempY[0][i], + marker: {fillColor: colorCodes[i % 8]}, + id: i + }); } i++; }); @@ -385,32 +414,30 @@ $(document).ready(function() { if (!isEmpty(newValues)) { var sql_query = 'UPDATE `' + window.parent.table + '` SET '; for (key in newValues) { - if (key != 'where_clause') { - sql_query += '`' + key + '`=' ; - var value = newValues[key]; + sql_query += '`' + key + '`=' ; + var value = newValues[key]; - // null - if (value == null) { - sql_query += 'NULL, '; + // null + if (value == null) { + sql_query += 'NULL, '; - // empty - } else if ($.trim(value) == '') { - sql_query += "'', "; + // empty + } else if ($.trim(value) == '') { + sql_query += "'', "; - // other + // other + } else { + // type explicitly identified + if (sqlTypes[key] != null) { + if (sqlTypes[key] == 'bit') { + sql_query += "b'" + value + "', "; + } + // type not explicitly identified } else { - // type explicitly identified - if (sqlTypes[key] != null) { - if (sqlTypes[key] == 'bit') { - sql_query += "b'" + value + "', "; - } - // type not explicitly identified + if (!isNumeric(value)) { + sql_query += "'" + value + "', "; } else { - if (!isNumeric(value)) { - sql_query += "'" + value + "', "; - } else { - sql_query += value + ', '; - } + sql_query += value + ', '; } } } @@ -553,6 +580,11 @@ $(document).ready(function() { } }; + // If data label is not set, do not show tooltips + if (dataLabel == '') { + currentSettings.tooltip.enabled = false; + } + $('#resizer').resizable({ resize: function() { currentChart.setSize( @@ -581,7 +613,13 @@ $(document).ready(function() { $.each(data, function(key, value) { var xVal = (xType == 'numeric') ? value[xLabel] : getTimeStamp(value[xLabel], $('#types_0').val()); var yVal = (yType == 'numeric') ? value[yLabel] : getTimeStamp(value[yLabel], $('#types_1').val()); - series[0].data.push({ name: value[dataLabel], x: xVal, y: yVal, marker: {fillColor: colorCodes[it % 8]} , id: it } ); + series[0].data.push({ + name: value[dataLabel], + x: xVal, + y: yVal, + marker: {fillColor: colorCodes[it % 8]}, + id: it + }); xCord.push(value[xLabel]); yCord.push(value[yLabel]); it++; @@ -612,7 +650,13 @@ $(document).ready(function() { tempX = getCord(xCord); $.each(data, function(key, value) { var yVal = (yType == 'numeric') ? value[yLabel] : getTimeStamp(value[yLabel], $('#types_1').val()); - series[0].data.push({ name: value[dataLabel], x: tempX[0][it], y: yVal, marker: {fillColor: colorCodes[it % 8]} , id: it } ); + series[0].data.push({ + name: value[dataLabel], + x: tempX[0][it], + y: yVal, + marker: {fillColor: colorCodes[it % 8]}, + id: it + }); it++; }); @@ -645,7 +689,13 @@ $(document).ready(function() { tempY = getCord(yCord); $.each(data, function(key, value) { var xVal = (xType == 'numeric') ? value[xLabel] : getTimeStamp(value[xLabel], $('#types_0').val()); - series[0].data.push({ name: value[dataLabel], y: tempY[0][it], x: xVal, marker: {fillColor: colorCodes[it % 8]} , id: it } ); + series[0].data.push({ + name: value[dataLabel], + y: tempY[0][it], + x: xVal, + marker: {fillColor: colorCodes[it % 8]}, + id: it + }); it++; }); if (xType == 'numeric') { @@ -677,7 +727,13 @@ $(document).ready(function() { tempX = getCord(xCord); tempY = getCord(yCord); $.each(data, function(key, value) { - series[0].data.push({ name: value[dataLabel], x: tempX[0][it], y: tempY[0][it], marker: {fillColor: colorCodes[it % 8]} , id: it } ); + series[0].data.push({ + name: value[dataLabel], + x: tempX[0][it], + y: tempY[0][it], + marker: {fillColor: colorCodes[it % 8]}, + id: it + }); it++; }); currentSettings.xAxis.labels = { hooks/post-receive -- phpMyAdmin

1 0

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

18 Sep '11

The branch, master has been updated via effa795c79aef8afc9891433da89cebe998f65bd (commit) from 5e83631469f286abb77c95adf5284923a3a0873a (commit) - Log ----------------------------------------------------------------- commit effa795c79aef8afc9891433da89cebe998f65bd Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Sep 18 19:50:11 2011 +0530 Wrong message used in 8373e5feec2232e6a17b342eb0bf74930431bfcc ----------------------------------------------------------------------- Summary of changes: tbl_select.php | 2 +- tbl_zoom_select.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tbl_select.php b/tbl_select.php index 6a2a5e4..19ec4e4 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_getIcon('b_browse.png', __('Browse')); +$titles['Browse'] = PMA_getIcon('b_browse.png', __('Browse foreign values')); $geom_types = PMA_getGISDatatypes(); /** diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php index 7d803c6..33b7591 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_getIcon('b_browse.png', __('Browse')); +$titles['Browse'] = PMA_getIcon('b_browse.png', __('Browse foreign values')); /** * 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-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