Merge branch 'QA_4_4'

Conflicts:
	libraries/db_designer.lib.php

1 files changed, 2 insertions, 0 deletions

diff --git a/js/pmd/history.js b/js/pmd/history.js
index 03a02b4883..6edadd7af6 100644
--- a/js/pmd/history.js
+++ b/js/pmd/history.js
@@ -191,6 +191,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';
@@ -199,6 +200,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';