Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Default data label now taken from table display field

  • Loading branch information...
commit 04e82bb1e908e233f1eb619324b84b18312282d7 1 parent 811996e
@ammaryasir ammaryasir authored
Showing with 8 additions and 5 deletions.
  1. +8 −5 tbl_zoom_select.php
View
13 tbl_zoom_select.php
@@ -67,6 +67,7 @@
$flag = 1;
$tbl_fields_type = $tbl_fields_collation = $tbl_fields_null = array();
$maxPlotlLimit = $GLOBALS['cfg']['maxRowPlotLimit'];
+
?>
<div id="sqlqueryresults"></div>
@@ -246,6 +247,12 @@
/*
* Other inputs like data label and mode go after selection of column criteria
*/
+
+ //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);
+ }
?>
<table>
<tr><td><label for="label"><?php echo __("Data Label"); ?></label>&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp</td>
@@ -306,15 +313,11 @@
$w[] = $whereClause;
} // end for
- //print_r($w);
if ($w) {
$sql_query .= ' WHERE ' . implode(' AND ', $w);
}
$sql_query .= ' LIMIT ' . $maxPlotlLimit;
- if ($dataLabel == '') {
- $dataLabel = PMA_getDisplayField($db,$table);
- }
-
+
/*
* Query execution part
*/
Please sign in to comment.
Something went wrong with that request. Please try again.