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

Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4

Browse Source
This commit is contained in:
Weblate 2015-06-24 13:30:46 +02:00
commit e2f0d39d61
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog
======================
4.4.11.0 (not yet released)
- bug Missing selected/entered values when editing active options in visual query builder
4.4.10.0 (2015-06-17)
- bug #4950 Issues in database selection for replication

2
js/pmd/history.js
View File

@ -199,6 +199,7 @@ function history_edit(index)
document.getElementById('query_having').style.display = 'block';
}
if (type == "Rename") {
document.getElementById('e_rename').value = history_array[index].get_obj().getrename_to();
document.getElementById('query_rename_to').style.left = '530px';
document.getElementById('query_rename_to').style.top = '130px';
document.getElementById('query_rename_to').style.position = 'absolute';
@ -207,6 +208,7 @@ function history_edit(index)
document.getElementById('query_rename_to').style.display = 'block';
}
if (type == "Aggregate") {
document.getElementById('e_operator').value = history_array[index].get_obj().get_operator();
document.getElementById('query_Aggregate').style.left = '530px';
document.getElementById('query_Aggregate').style.top = '130px';
document.getElementById('query_Aggregate').style.position = 'absolute';

2
libraries/db_designer.lib.php
View File

@ -1233,7 +1233,7 @@ function PMA_getAggregateQueryPanel()
$html .= '<option value="min"> MIN </option>';
$html .= '<option value="max"> MAX </option>';
$html .= '<option value="avg"> AVG </option>';
$html .= '<option value="avg"> COUNT </option>';
$html .= '<option value="count"> COUNT </option>';
$html .= '</select>';
$html .= '</td></tr>';
$html .= '</tbody>';