From d093c66f1f8df839afb232303dc0ea0b2ac7079a Mon Sep 17 00:00:00 2001
From: Piyush Vijay <piyushvijay.1997@gmail.com>
Date: Sat, 31 Mar 2018 03:15:19 +0530
Subject: [PATCH] Designer: "Add options" dialog doesn't reset when canceling:
 #14110 issue fixed (#14117)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Designer: "Add options" dialog doesn't reset when canceling: Fix #14110
Signed-off-by: Piyush Vijay <piyushvijay.1997@gmail.com>

* Designer: Add option dialogue error handling needs to be modified Fix #14126
Signed-off-by: Piyush Vijay <piyushvijay.1997@gmail.com>
(cherry picked from commit 6700b2d56fc87315a741ca3c2549fba96a3172df)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
---
 js/designer/move.js | 28 +++++++++++++---------------
 js/messages.php     |  1 +
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/js/designer/move.js b/js/designer/move.js
index f1fd25e8f9..e7d18d6fc0 100644
--- a/js/designer/move.js
+++ b/js/designer/move.js
@@ -1741,6 +1741,16 @@ function Click_option (id_this, column_name, table_name) {
 
 function Close_option () {
     document.getElementById('designer_optionse').style.display = 'none';
+    document.getElementById('rel_opt').value = '--';
+    document.getElementById('Query').value = '';
+    document.getElementById('new_name').value = '';
+    document.getElementById('operator').value = '---';
+    document.getElementById('groupby').checked = false;
+    document.getElementById('h_rel_opt').value = '--';
+    document.getElementById('h_operator').value = '---';
+    document.getElementById('having').value = '';
+    document.getElementById('orderby').value = '---';
+
 }
 
 function Select_all (id_this, owner) {
@@ -1837,59 +1847,47 @@ function add_object () {
     var init = history_array.length;
     if (rel.value !== '--') {
         if (document.getElementById('Query').value === '') {
-            document.getElementById('designer_hint').innerHTML = 'value/subQuery is empty';
-            document.getElementById('designer_hint').style.display = 'block';
+            PMA_ajaxShowMessage(PMA_sprintf(PMA_messages.strQueryEmpty));
             return;
         }
         p = document.getElementById('Query');
         where_obj = new where(rel.value, p.value);// make where object
         history_array.push(new history_obj(col_name, where_obj, tab_name, h_tabs[downer + '.' + tab_name], 'Where'));
         sum = sum + 1;
-        rel.value = '--';
-        p.value = '';
     }
     if (document.getElementById('new_name').value !== '') {
         var rename_obj = new rename(document.getElementById('new_name').value);// make Rename object
         history_array.push(new history_obj(col_name, rename_obj, tab_name, h_tabs[downer + '.' + tab_name], 'Rename'));
         sum = sum + 1;
-        document.getElementById('new_name').value = '';
     }
     if (document.getElementById('operator').value !== '---') {
         var aggregate_obj = new aggregate(document.getElementById('operator').value);
         history_array.push(new history_obj(col_name, aggregate_obj, tab_name, h_tabs[downer + '.' + tab_name], 'Aggregate'));
         sum = sum + 1;
-        document.getElementById('operator').value = '---';
         // make aggregate operator
     }
     if (document.getElementById('groupby').checked === true) {
         history_array.push(new history_obj(col_name, 'GroupBy', tab_name, h_tabs[downer + '.' + tab_name], 'GroupBy'));
         sum = sum + 1;
-        document.getElementById('groupby').checked = false;
         // make groupby
     }
     if (document.getElementById('h_rel_opt').value !== '--') {
         if (document.getElementById('having').value === '') {
-            document.getElementById('designer_hint').innerHTML = 'value/subQuery is empty';
-            document.getElementById('designer_hint').style.display = 'block';
             return;
         }
-        p = document.getElementById('having');
         where_obj = new having(
             document.getElementById('h_rel_opt').value,
-            p.value,
+            document.getElementById('having').value,
             document.getElementById('h_operator').value
         );// make where object
         history_array.push(new history_obj(col_name, where_obj, tab_name, h_tabs[downer + '.' + tab_name], 'Having'));
         sum = sum + 1;
-        document.getElementById('h_rel_opt').value = '--';
-        document.getElementById('h_operator').value = '---';
-        p.value = ''; // make having
+        // make having
     }
     if (document.getElementById('orderby').value !== '---') {
         var oderby_obj = new orderby(document.getElementById('orderby').value);
         history_array.push(new history_obj(col_name, oderby_obj, tab_name, h_tabs[downer + '.' + tab_name], 'OrderBy'));
         sum = sum + 1;
-        document.getElementById('orderby').value = '---';
         // make orderby
     }
     PMA_ajaxShowMessage(PMA_sprintf(PMA_messages.strObjectsCreated, sum));
diff --git a/js/messages.php b/js/messages.php
index a5f54fabc4..257bc788db 100644
--- a/js/messages.php
+++ b/js/messages.php
@@ -559,6 +559,7 @@ $js_messages['strLeavingDesigner'] = __(
     'You haven\'t saved the changes in the layout. They will be lost if you'
     . ' don\'t save them. Do you want to continue?'
 );
+$js_messages['strQueryEmpty'] = __('value/subQuery is empty');
 $js_messages['strAddTables'] = __('Add tables from other databases');
 $js_messages['strPageName'] = __('Page name');
 $js_messages['strSavePage'] = __('Save page');